December 22nd, 2005
»
@@ -745,6 +753,7 @@
+
@@ -878,6 +887,7 @@
+
From cvs at kolab.org Tue Apr 17 13:03:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 13:03:52 +0200 (CEST)
Subject: thomas: server obmtool.conf,1.245,1.246 release-notes.txt,1.97,1.98
Message-ID: <20070417110352.1DA4A1006AA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv13870
Modified Files:
obmtool.conf release-notes.txt
Log Message:
New clamav release
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- obmtool.conf 13 Apr 2007 17:30:16 -0000 1.245
+++ obmtool.conf 17 Apr 2007 11:03:49 -0000 1.246
@@ -154,7 +154,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.90-20070214_kolab
+ @install ${altloc}clamav-0.90.2-20070413_kolab
@install ${altloc}perl-kolab-5.8.7-20070302
@install ${altloc}kolabd-2.0.99-20070302 --define kolab_version=$kolab_version
@install ${altloc}kolab-webadmin-2.0.99-20070302 --define kolab_version=$kolab_version
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- release-notes.txt 13 Apr 2007 17:25:18 -0000 1.97
+++ release-notes.txt 17 Apr 2007 11:03:49 -0000 1.98
@@ -37,9 +37,9 @@
Changes since 2.1 rc 1:
- - clamav-0.90.1-20070302_kolab
+ - clamav-0.90.2-20070413_kolab
- New upstream version.
+ New upstream version, fixes various security issues.
- fsl-1.7.0-20070303
From cvs at kolab.org Tue Apr 17 13:03:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 13:03:52 +0200 (CEST)
Subject: thomas: server/clamav Makefile,1.2,1.3 kolab.patch,1.3,1.4
Message-ID: <20070417110352.202BA1006AC@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv13870/clamav
Modified Files:
Makefile kolab.patch
Log Message:
New clamav release
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 12 Mar 2007 14:54:44 -0000 1.2
+++ Makefile 17 Apr 2007 11:03:50 -0000 1.3
@@ -12,9 +12,9 @@
endif
PACKAGE=clamav
-VERSION=0.90.1
-RELEASE=20070302
-KOLABRELEASE=20070302_kolab
+VERSION=0.90.2
+RELEASE=20070413
+KOLABRELEASE=20070413_kolab
RPM=/kolab/bin/openpkg rpm
KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/clamav/kolab.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab.patch 12 Mar 2007 14:54:44 -0000 1.3
+++ kolab.patch 17 Apr 2007 11:03:50 -0000 1.4
@@ -3,9 +3,9 @@
@@ -33,7 +33,7 @@ Class: EVAL
Group: AntiVirus
License: GPL
- Version: 0.90.1
--Release: 20070302
-+Release: 20070302_kolab
+ Version: 0.90.2
+-Release: 20070413
++Release: 20070413_kolab
# package options
%option with_milter no
From cvs at kolab.org Tue Apr 17 13:07:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 13:07:57 +0200 (CEST)
Subject: thomas: server obmtool.conf,1.246,1.247 release-notes.txt,1.98,1.99
Message-ID: <20070417110757.768991006AA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv14325
Modified Files:
obmtool.conf release-notes.txt
Log Message:
Fix for CVE-2007-1536 (file)
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- obmtool.conf 17 Apr 2007 11:03:49 -0000 1.246
+++ obmtool.conf 17 Apr 2007 11:07:55 -0000 1.247
@@ -116,7 +116,7 @@
@install ${loc}autoconf-2.59-2.5.0
@install ${loc}automake-1.9.6-2.5.0
@install ${loc}gettext-0.14.5-2.5.0
- @install ${altloc}file-4.15-2.5.0_kolab
+ @install ${altloc}file-4.15-2.5.0_kolab2
@install ${loc}openpkg-tools-0.8.47-2.5.0
@install ${loc}patch-2.5.9-2.5.0
@install ${loc}sed-4.1.4-2.5.0
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- release-notes.txt 17 Apr 2007 11:03:49 -0000 1.98
+++ release-notes.txt 17 Apr 2007 11:07:55 -0000 1.99
@@ -41,6 +41,11 @@
New upstream version, fixes various security issues.
+ - file-4.15-2.5.0_kolab2
+
+ Fix for security issue described in CVE-2007-1536:
+ buffer overflow, remotely exploitable due to the usage of file in amavisd-new
+
- fsl-1.7.0-20070303
New upstream version.
From cvs at kolab.org Tue Apr 17 13:07:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 13:07:57 +0200 (CEST)
Subject: thomas: server/file file-cve-2007-1536.patch, NONE, 1.1 Makefile, 1.2,
1.3 kolab.patch, 1.1, 1.2
Message-ID: <20070417110757.7BED61006AC@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/file
In directory doto:/tmp/cvs-serv14325/file
Modified Files:
Makefile kolab.patch
Added Files:
file-cve-2007-1536.patch
Log Message:
Fix for CVE-2007-1536 (file)
--- NEW FILE: file-cve-2007-1536.patch ---
diff -urN file-4.15.orig/src/file.h file-4.15/src/file.h
--- file-4.15.orig/src/file.h 2005-07-29 19:57:20.000000000 +0200
+++ file-4.15/src/file.h 2007-04-17 12:57:57.976179000 +0200
@@ -234,7 +234,7 @@
/* Accumulation buffer */
char *buf;
char *ptr;
- size_t len;
+ size_t left;
size_t size;
/* Printable buffer */
char *pbuf;
diff -urN file-4.15.orig/src/funcs.c file-4.15/src/funcs.c
--- file-4.15.orig/src/funcs.c 2005-07-12 22:05:38.000000000 +0200
+++ file-4.15/src/funcs.c 2007-04-17 12:57:57.976179000 +0200
@@ -26,6 +26,7 @@
*/
#include "file.h"
#include "magic.h"
+#include
#include
#include
#include
@@ -46,27 +47,31 @@
file_printf(struct magic_set *ms, const char *fmt, ...)
{
va_list ap;
- size_t len;
+ size_t len, size;
char *buf;
va_start(ap, fmt);
- if ((len = vsnprintf(ms->o.ptr, ms->o.len, fmt, ap)) >= ms->o.len) {
+ if ((len = vsnprintf(ms->o.ptr, ms->o.left, fmt, ap)) >= ms->o.left) {
+ long diff; /* XXX: really ptrdiff_t */
+
va_end(ap);
- if ((buf = realloc(ms->o.buf, len + 1024)) == NULL) {
+ size = (ms->o.size - ms->o.left) + len + 1024;
+ if ((buf = realloc(ms->o.buf, size)) == NULL) {
file_oomem(ms);
return -1;
}
- ms->o.ptr = buf + (ms->o.ptr - ms->o.buf);
+ diff = ms->o.ptr - ms->o.buf;
+ ms->o.ptr = buf + diff;
ms->o.buf = buf;
- ms->o.len = ms->o.size - (ms->o.ptr - ms->o.buf);
- ms->o.size = len + 1024;
+ ms->o.left = size - diff;
+ ms->o.size = size;
va_start(ap, fmt);
- len = vsnprintf(ms->o.ptr, ms->o.len, fmt, ap);
+ len = vsnprintf(ms->o.ptr, ms->o.left, fmt, ap);
}
ms->o.ptr += len;
- ms->o.len -= len;
+ ms->o.left -= len;
va_end(ap);
return 0;
}
@@ -155,8 +160,8 @@
protected const char *
file_getbuffer(struct magic_set *ms)
{
- char *nbuf, *op, *np;
- size_t nsize;
+ char *pbuf, *op, *np;
+ size_t psize, len;
if (ms->haderr)
return NULL;
@@ -164,14 +169,17 @@
if (ms->flags & MAGIC_RAW)
return ms->o.buf;
- nsize = ms->o.len * 4 + 1;
- if (ms->o.psize < nsize) {
- if ((nbuf = realloc(ms->o.pbuf, nsize)) == NULL) {
+ len = ms->o.size - ms->o.left;
+ /* * 4 is for octal representation, + 1 is for NUL */
+ psize = len * 4 + 1;
+ assert(psize > len);
+ if (ms->o.psize < psize) {
+ if ((pbuf = realloc(ms->o.pbuf, psize)) == NULL) {
file_oomem(ms);
return NULL;
}
- ms->o.psize = nsize;
- ms->o.pbuf = nbuf;
+ ms->o.psize = psize;
+ ms->o.pbuf = pbuf;
}
for (np = ms->o.pbuf, op = ms->o.buf; *op; op++) {
diff -urN file-4.15.orig/src/magic.c file-4.15/src/magic.c
--- file-4.15.orig/src/magic.c 2005-06-30 18:33:01.000000000 +0200
+++ file-4.15/src/magic.c 2007-04-17 12:57:57.966179000 +0200
@@ -89,7 +89,7 @@
goto free1;
}
- ms->o.ptr = ms->o.buf = malloc(ms->o.size = 1024);
+ ms->o.ptr = ms->o.buf = malloc(ms->o.left = ms->o.size = 1024);
if (ms->o.buf == NULL)
goto free1;
@@ -101,7 +101,6 @@
if (ms->c.off == NULL)
goto free3;
- ms->o.len = 0;
ms->haderr = 0;
ms->error = -1;
ms->mlist = NULL;
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/file/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 6 Nov 2006 13:22:36 -0000 1.2
+++ Makefile 17 Apr 2007 11:07:55 -0000 1.3
@@ -14,17 +14,18 @@
PACKAGE=file
VERSION=4.15
RELEASE=2.5.0
-KOLABRELEASE=2.5.0_kolab
+KOLABRELEASE=2.5.0_kolab2
RPM=/kolab/bin/openpkg rpm
KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm kolab-filemagic.patch kolab.patch
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm kolab-filemagic.patch file-cve-2007-1536.patch kolab.patch
$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
cp $(KOLABCVSDIR)/kolab-filemagic.patch $(KOLABRPMSRC)/$(PACKAGE)/
+ cp $(KOLABCVSDIR)/file-cve-2007-1536.patch $(KOLABRPMSRC)/$(PACKAGE)/
cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for file.spec
cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec
cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/file/kolab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.patch 19 Oct 2006 02:31:30 -0000 1.1
+++ kolab.patch 17 Apr 2007 11:07:55 -0000 1.2
@@ -1,29 +1,31 @@
---- file.spec.orig 2006-10-19 04:17:54.000000000 +0200
-+++ file.spec 2006-10-19 04:20:49.000000000 +0200
-@@ -37,7 +37,7 @@ Class: BASE
+--- file.spec.orig 2005-10-11 14:46:18.000000000 +0200
++++ file.spec 2007-04-17 13:01:28.276179000 +0200
+@@ -37,7 +37,7 @@
Group: Filesystem
License: BSD
Version: %{V_api_c}
-Release: 2.5.0
-+Release: 2.5.0_kolab
++Release: 2.5.0_kolab2
# package options
%option with_perl no
-@@ -46,6 +46,9 @@ Release: 2.5.0
+@@ -46,6 +46,10 @@
Source0: ftp://ftp.astron.com/pub/file/file-%{V_api_c}.tar.gz
Source1: http://www.cpan.org/modules/by-module/File/File-LibMagic-%{V_api_pl}.tgz
+# list of patches
+Patch0: kolab-filemagic.patch
++Patch1: file-cve-2007-1536.patch
+
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-@@ -79,6 +82,7 @@ AutoReqProv: no
+@@ -79,6 +83,8 @@
%prep
%setup -q
%setup -q -D -T -a 1
-+ %patch -p0
++ %patch -p0 -P 0
++ %patch -p1 -P 1
%build
ACLOCAL=true \
From cvs at kolab.org Tue Apr 17 15:51:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 15:51:38 +0200 (CEST)
Subject: thomas: server/spamassassin - New directory
Message-ID: <20070417135138.1316A1005CE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/spamassassin
In directory doto:/tmp/cvs-serv18135/spamassassin
Log Message:
Directory /kolabrepository/server/spamassassin added to the repository
From cvs at kolab.org Tue Apr 17 16:05:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 16:05:19 +0200 (CEST)
Subject: thomas: server obmtool.conf, 1.247, 1.248 release-notes.txt, 1.99,
1.100
Message-ID: <20070417140519.D8B5B1005AE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv18438
Modified Files:
obmtool.conf release-notes.txt
Log Message:
New spamassassin package fixing security and policy issues.
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- obmtool.conf 17 Apr 2007 11:07:55 -0000 1.247
+++ obmtool.conf 17 Apr 2007 14:05:17 -0000 1.248
@@ -149,7 +149,7 @@
--with=mbstring
@install ${altloc}php-smarty-2.6.10-20051003
@install ${loc}gmp-4.1.4-2.5.0
- @install ${loc}spamassassin-3.1.0-2.5.0
+ @install ${loc}spamassassin-3.1.0-2.5.1_kolab
@install ${plusloc}amavisd-2.3.3-2.5.0
@trigger ${loc}curl-7.15.0-2.5.2
@install ${loc}bc-1.06-2.5.0
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- release-notes.txt 17 Apr 2007 11:07:55 -0000 1.99
+++ release-notes.txt 17 Apr 2007 14:05:17 -0000 1.100
@@ -52,6 +52,16 @@
kolab/issue1172 (Cyrus Imapd dies when logfile exceeds 2 GiB)
+ - spamassassin-3.1.0-2.5.1_kolab
+
+ Fix for security issue described in CVE-2007-0451:
+ possible DoS due to incredibly long URIs found in the message content
+
+ Disabled external DNS and URI blacklists, because some of these
+ services require payment if used for many mailboxes.
+
+ Ignore headers inserted on the receiving side for bayes filtering.
+
- perl-kolab-5.8.7-20070???
Added debug option for verbose logging to stderr.
From cvs at kolab.org Tue Apr 17 16:05:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 16:05:19 +0200 (CEST)
Subject: thomas: server/spamassassin .cvsignore, NONE, 1.1 Makefile, NONE,
1.1 kolab.patch, NONE, 1.1 spamassassin-cve-2007-0451.patch,
NONE, 1.1
Message-ID: <20070417140519.DDB131005CE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/spamassassin
In directory doto:/tmp/cvs-serv18438/spamassassin
Added Files:
.cvsignore Makefile kolab.patch
spamassassin-cve-2007-0451.patch
Log Message:
New spamassassin package fixing security and policy issues.
--- NEW FILE: .cvsignore ---
*.src.rpm
--- NEW FILE: Makefile ---
ifeq "x$(KOLABPKGURI)" "x"
KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/UPD
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
KOLABRPMPKG = /kolab/RPM/PKG
endif
ifeq "x$(KOLABCVSDIR)" "x"
KOLABCVSDIR = $(CURDIR)
endif
PACKAGE=spamassassin
VERSION=3.1.0
RELEASE=2.5.1
KOLABRELEASE=2.5.1_kolab
RPM=/kolab/bin/openpkg rpm
KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm spamassassin-cve-2007-0451.patch kolab.patch
$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
cp $(KOLABCVSDIR)/spamassassin-cve-2007-0451.patch $(KOLABRPMSRC)/$(PACKAGE)/
cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/
cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec
cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
dist: all
cp -p $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
clean:
rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)
--- NEW FILE: kolab.patch ---
--- spamassassin.spec.orig 2006-02-25 18:41:01.000000000 +0100
+++ spamassassin.spec 2007-04-17 15:23:34.976179000 +0200
@@ -38,7 +38,7 @@
Group: Mail
License: ASF
Version: %{V_here}
-Release: 2.5.1
+Release: 2.5.1_kolab
# package options
%option with_fsl yes
@@ -49,6 +49,9 @@
Source2: local.cf
Source3: fsl.spamassassin
+# list of patches
+Patch0: spamassassin-cve-2007-0451.patch
+
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
@@ -81,6 +84,7 @@
%prep
%setup -q -n Mail-SpamAssassin-%{V_sdir}
+ %patch -p1 -P 0
%build
# configure package
--- local.cf.orig 2004-10-15 22:26:31.000000000 +0200
+++ local.cf 2007-04-17 15:48:21.286179000 +0200
@@ -11,3 +11,77 @@
#whitelist_from someone at somewhere.com
#whitelist_to someone at somewhere.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_NJABL_RELAY 0
+score RCVD_IN_NJABL_DUL 0
+score RCVD_IN_NJABL_SPAM 0
+score RCVD_IN_NJABL_MULTI 0
+score RCVD_IN_NJABL_CGI 0
+score RCVD_IN_NJABL_PROXY 0
+score RCVD_IN_SORBS_HTTP 0
+score RCVD_IN_SORBS_SOCKS 0
+score RCVD_IN_SORBS_MISC 0
+score RCVD_IN_SORBS_SMTP 0
+score RCVD_IN_SORBS_WEB 0
+score RCVD_IN_SORBS_BLOCK 0
+score RCVD_IN_SORBS_ZOMBIE 0
+score RCVD_IN_SORBS_DUL 0
+score RCVD_IN_SBL 0
+score RCVD_IN_XBL 0
+score DNS_FROM_RFC_DSN 0
+score DNS_FROM_RFC_POST 0
+score DNS_FROM_RFC_ABUSE 0
+score DNS_FROM_RFC_WHOIS 0
+score DNS_FROM_RFC_BOGUSMX 0
+score RCVD_IN_WHOIS_BOGONS 0
+score RCVD_IN_WHOIS_HIJACKED 0
+score RCVD_IN_WHOIS_INVALID 0
+score RCVD_IN_DSBL 0
+score DNS_FROM_AHBL_RHSBL 0
+score DNS_FROM_SECURITYSAGE 0
+score RCVD_IN_BL_SPAMCOP_NET 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
+score RCVD_IN_BSP_TRUSTED 0
+score RCVD_IN_BSP_OTHER 0
+score RCVD_IN_IADB_VOUCHED 0
+score HABEAS_ACCREDITED_COI 0
+score HABEAS_ACCREDITED_SOI 0
+score HABEAS_CHECKED 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
+
--- NEW FILE: spamassassin-cve-2007-0451.patch ---
diff -urN Mail-SpamAssassin-3.1.0.orig/lib/Mail/SpamAssassin/Constants.pm Mail-SpamAssassin-3.1.0/lib/Mail/SpamAssassin/Constants.pm
--- Mail-SpamAssassin-3.1.0.orig/lib/Mail/SpamAssassin/Constants.pm 2005-08-12 02:38:47.000000000 +0200
+++ Mail-SpamAssassin-3.1.0/lib/Mail/SpamAssassin/Constants.pm 2007-04-17 15:11:07.926179000 +0200
@@ -37,6 +37,7 @@
META_TEST_MIN_PRIORITY HARVEST_DNSBL_PRIORITY MBX_SEPARATOR
MAX_BODY_LINE_LENGTH MAX_HEADER_KEY_LENGTH MAX_HEADER_VALUE_LENGTH
MAX_HEADER_LENGTH ARITH_EXPRESSION_LEXER AI_TIME_UNKNOWN
+ MAX_URI_LENGTH
);
%EXPORT_TAGS = (
@@ -172,6 +173,9 @@
# maximum byte length of entire header
use constant MAX_HEADER_LENGTH => 65536;
+# maximum byte length of any given URI
+use constant MAX_URI_LENGTH => 1024;
+
# used for meta rules and "if" conditionals in Conf::Parser
use constant ARITH_EXPRESSION_LEXER => qr/(?:
[\-\+\d\.]+| # A Number
diff -urN Mail-SpamAssassin-3.1.0.orig/lib/Mail/SpamAssassin/HTML.pm Mail-SpamAssassin-3.1.0/lib/Mail/SpamAssassin/HTML.pm
--- Mail-SpamAssassin-3.1.0.orig/lib/Mail/SpamAssassin/HTML.pm 2005-08-12 02:38:47.000000000 +0200
+++ Mail-SpamAssassin-3.1.0/lib/Mail/SpamAssassin/HTML.pm 2007-04-17 15:08:38.716179000 +0200
@@ -25,6 +25,7 @@
use HTML::Parser 3.24 ();
use Mail::SpamAssassin::Logger;
+use Mail::SpamAssassin::Constants qw(:sa);
use vars qw($re_loose $re_strict $re_other @ISA @EXPORT @EXPORT_OK);
@@ -142,6 +143,7 @@
$self->put_results(anchor => $self->{anchor});
$self->put_results(uri_detail => $self->{uri});
+ $self->put_results(uri_truncated => $self->{uri_truncated});
# final results scalars
$self->put_results(image_area => $self->{image_area});
@@ -354,9 +356,7 @@
sub push_uri {
my ($self, $type, $uri) = @_;
- # URIs don't have leading/trailing whitespace ...
- $uri =~ s/^\s+//;
- $uri =~ s/\s+$//;
+ $uri = $self->canon_uri($uri);
my $target = target_uri($self->{base_href} || "", $uri);
@@ -366,6 +366,22 @@
}
}
+sub canon_uri {
+ my ($self, $uri) = @_;
+
+ # URIs don't have leading/trailing whitespace ...
+ $uri =~ s/^\s+//;
+ $uri =~ s/\s+$//;
+
+ # Make sure all the URIs are nice and short
+ if (length $uri > MAX_URI_LENGTH) {
+ $self->{'uri_truncated'} = 1;
+ $uri = substr $uri, 0, MAX_URI_LENGTH;
+ }
+
+ return $uri;
+}
+
sub html_uri {
my ($self, $tag, $attr) = @_;
@@ -392,6 +408,8 @@
}
elsif ($tag eq "base") {
if (my $uri = $attr->{href}) {
+ $uri = $self->canon_uri($uri);
+
# use to turn relative links into absolute links
# even if it is a base URI, handle like a normal URI as well
@@ -694,7 +712,7 @@
# special text delimiters - and
if ($tag eq "a") {
- $self->{anchor_last} = (exists $attr->{href} ? $attr->{href} : "");
+ $self->{anchor_last} = (exists $attr->{href} ? $self->canon_uri($attr->{href}) : "");
push(@{$self->{uri}->{$self->{anchor_last}}->{anchor_text}}, '');
push(@{$self->{anchor}}, '');
}
diff -urN Mail-SpamAssassin-3.1.0.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm Mail-SpamAssassin-3.1.0/lib/Mail/SpamAssassin/PerMsgStatus.pm
--- Mail-SpamAssassin-3.1.0.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm 2005-09-14 04:07:31.000000000 +0200
+++ Mail-SpamAssassin-3.1.0/lib/Mail/SpamAssassin/PerMsgStatus.pm 2007-04-17 15:08:38.716179000 +0200
@@ -1971,6 +1971,7 @@
# get URIs from HTML parsing
# use the metadata version since $self->{html} may not be setup
my $detail = $self->{msg}->{metadata}->{html}->{uri_detail} || { };
+ $self->{'uri_truncated'} = 1 if $self->{msg}->{metadata}->{html}->{uri_truncated};
# don't keep dereferencing ...
my $redirector_patterns = $self->{conf}->{redirector_patterns};
@@ -2108,6 +2109,14 @@
}
}
+ # Make sure all the URIs are nice and short
+ foreach my $uri ( @uris ) {
+ if (length $uri > MAX_URI_LENGTH) {
+ $self->{'uri_truncated'} = 1;
+ $uri = substr $uri, 0, MAX_URI_LENGTH;
+ }
+ }
+
# setup the cache and return
$self->{parsed_uri_list} = \@uris;
}
diff -urN Mail-SpamAssassin-3.1.0.orig/rules/20_body_tests.cf Mail-SpamAssassin-3.1.0/rules/20_body_tests.cf
--- Mail-SpamAssassin-3.1.0.orig/rules/20_body_tests.cf 2005-08-12 02:38:50.000000000 +0200
+++ Mail-SpamAssassin-3.1.0/rules/20_body_tests.cf 2007-04-17 15:11:49.916179000 +0200
@@ -143,5 +143,8 @@
body HTTPS_IP_MISMATCH eval:check_https_ip_mismatch()
describe HTTPS_IP_MISMATCH IP to HTTPS link found in HTML
+body URI_TRUNCATED eval:check_uri_truncated()
+describe URI_TRUNCATED Message contained a URI which was truncated
+
rawbody INTERRUPTUS /(?:[a-zA-Z0-9]<[\/ ]{0,2}?(?!br)(?!p)(?!sup)(?!li)(?!b)(?!i)(?!option)(?!a (?:href|name))(?:\b|!--)[^>]{0,64}?>[a-zA-Z0-9].{0,64}){3}/i
describe INTERRUPTUS Message looks to contain HTML-interrupted text
From cvs at kolab.org Tue Apr 17 16:07:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 16:07:41 +0200 (CEST)
Subject: thomas: server obmtool.conf,1.248,1.249
Message-ID: <20070417140741.1AEBA1005AE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv18739
Modified Files:
obmtool.conf
Log Message:
fetch spamassassin from altloc
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- obmtool.conf 17 Apr 2007 14:05:17 -0000 1.248
+++ obmtool.conf 17 Apr 2007 14:07:39 -0000 1.249
@@ -149,7 +149,7 @@
--with=mbstring
@install ${altloc}php-smarty-2.6.10-20051003
@install ${loc}gmp-4.1.4-2.5.0
- @install ${loc}spamassassin-3.1.0-2.5.1_kolab
+ @install ${altloc}spamassassin-3.1.0-2.5.1_kolab
@install ${plusloc}amavisd-2.3.3-2.5.0
@trigger ${loc}curl-7.15.0-2.5.2
@install ${loc}bc-1.06-2.5.0
From cvs at kolab.org Tue Apr 17 16:34:18 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 16:34:18 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers kolab-resource-handlers.spec,
1.144, NONE
Message-ID: <20070417143418.306341005CE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers
In directory doto:/tmp/cvs-serv19687
Removed Files:
kolab-resource-handlers.spec
Log Message:
Removed obsolete spec file, now generated from .spec.in
--- kolab-resource-handlers.spec DELETED ---
From cvs at kolab.org Tue Apr 17 16:44:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 16:44:38 +0200 (CEST)
Subject: thomas: server obmtool.conf,1.249,1.250
Message-ID: <20070417144438.025731005CE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv19953
Modified Files:
obmtool.conf
Log Message:
Bumped version numbers from 2.0.99 to 2.1.0 in preparation for 2.1rc2
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- obmtool.conf 17 Apr 2007 14:07:39 -0000 1.249
+++ obmtool.conf 17 Apr 2007 14:44:35 -0000 1.250
@@ -155,12 +155,12 @@
@install ${loc}bc-1.06-2.5.0
@install ${loc}pkgconfig-0.19-2.5.0
@install ${altloc}clamav-0.90.2-20070413_kolab
- @install ${altloc}perl-kolab-5.8.7-20070302
- @install ${altloc}kolabd-2.0.99-20070302 --define kolab_version=$kolab_version
- @install ${altloc}kolab-webadmin-2.0.99-20070302 --define kolab_version=$kolab_version
- @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
- @install ${altloc}kolab-resource-handlers-2.0.99-20070302 --define kolab_version=$kolab_version
- @install ${altloc}kolab-horde-fbview-2.0.99-20070112 --define kolab_version=$kolab_version
+ @install ${altloc}perl-kolab-5.8.7-20070417
+ @install ${altloc}kolabd-2.1.0-20070417 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-webadmin-2.1.0-20070417 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-horde-framework-2.1.0-20070417 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-resource-handlers-2.1.0-20070417 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-horde-fbview-2.1.0-20070417 --define kolab_version=$kolab_version
@check
if test ! -e "/usr/bin/kolab" ; then
From cvs at kolab.org Tue Apr 17 16:44:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 16:44:38 +0200 (CEST)
Subject: thomas: server/kolab-horde-framework Makefile, 1.3,
1.4 kolab-horde-framework.spec, 1.5, 1.6
Message-ID: <20070417144438.147341005DC@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-horde-framework
In directory doto:/tmp/cvs-serv19953/kolab-horde-framework
Modified Files:
Makefile kolab-horde-framework.spec
Log Message:
Bumped version numbers from 2.0.99 to 2.1.0 in preparation for 2.1rc2
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-horde-framework/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 20 Dec 2005 19:49:27 -0000 1.3
+++ Makefile 17 Apr 2007 14:44:36 -0000 1.4
@@ -4,8 +4,8 @@
endif
PACKAGE = kolab-horde-framework
-VERSION = 2.0.99
-RELEASE = 20051220
+VERSION = 2.1.0
+RELEASE = 20070417
KOLABRELEASE = $(RELEASE)
PEARVERSION = 1.3
Index: kolab-horde-framework.spec
===================================================================
RCS file: /kolabrepository/server/kolab-horde-framework/kolab-horde-framework.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab-horde-framework.spec 20 Dec 2005 19:49:27 -0000 1.5
+++ kolab-horde-framework.spec 17 Apr 2007 14:44:36 -0000 1.6
@@ -1,6 +1,6 @@
# Versions
%define V_php_horde_pear 1.3
-%define V_kolab_horde 2.0.99
+%define V_kolab_horde 2.1.0
# Package Information
Name: kolab-horde-framework
@@ -22,7 +22,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
-PreReq: kolabd >= 2.0.99-20051014, apache, php, php::with_pear = yes
+PreReq: kolabd >= 2.1.0-20070417, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Tue Apr 17 16:44:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 16:44:38 +0200 (CEST)
Subject: thomas: server/kolab-horde-fbview Makefile, 1.3,
1.4 kolab-horde-fbview.spec, 1.4, 1.5
Message-ID: <20070417144438.090821005D2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-horde-fbview
In directory doto:/tmp/cvs-serv19953/kolab-horde-fbview
Modified Files:
Makefile kolab-horde-fbview.spec
Log Message:
Bumped version numbers from 2.0.99 to 2.1.0 in preparation for 2.1rc2
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 12 Jan 2007 18:12:33 -0000 1.3
+++ Makefile 17 Apr 2007 14:44:35 -0000 1.4
@@ -3,8 +3,8 @@
endif
PACKAGE = kolab-horde-fbview
-VERSION = 2.0.99
-RELEASE = 20070112
+VERSION = 2.1.0
+RELEASE = 20070417
KOLABRELEASE = $(RELEASE)
RPM = /kolab/bin/openpkg rpm
Index: kolab-horde-fbview.spec
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab-horde-fbview.spec 12 Jan 2007 18:12:33 -0000 1.4
+++ kolab-horde-fbview.spec 17 Apr 2007 14:44:35 -0000 1.5
@@ -1,5 +1,5 @@
# Versions
-%define V_kolab_fbview 2.0.99
+%define V_kolab_fbview 2.1.0
# Package Information
Name: kolab-horde-fbview
@@ -20,7 +20,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
-PreReq: kolabd >= 2.0.99-20050727, kolab-horde-framework >= 2.0.99-20051014, apache, php, php::with_pear = yes
+PreReq: kolabd >= 2.1.0-20070417, kolab-horde-framework >= 2.1.0-20070417, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Tue Apr 17 16:44:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 16:44:38 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers
configure.ac, 1.4, 1.5 kolab-resource-handlers.spec.in, 1.4, 1.5
Message-ID: <20070417144438.127B31005DB@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers
In directory doto:/tmp/cvs-serv19953/kolab-resource-handlers/kolab-resource-handlers
Modified Files:
configure.ac kolab-resource-handlers.spec.in
Log Message:
Bumped version numbers from 2.0.99 to 2.1.0 in preparation for 2.1rc2
Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.ac 14 Jan 2006 22:16:56 -0000 1.4
+++ configure.ac 17 Apr 2007 14:44:36 -0000 1.5
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
-m4_define(_VERSION,2.0.99)
+m4_define(_VERSION,2.1.0)
AC_INIT([kolab-resource-handlers],[_VERSION],[kolab-devel at kolab.org])
AC_CONFIG_AUX_DIR(.)
Index: kolab-resource-handlers.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/kolab-resource-handlers.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab-resource-handlers.spec.in 14 Jan 2006 22:16:56 -0000 1.4
+++ kolab-resource-handlers.spec.in 17 Apr 2007 14:44:36 -0000 1.5
@@ -20,7 +20,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
-PreReq: kolabd >= 2.0.99-20050727, kolab-horde-framework >= 2.0.99-20051014, apache, php, php::with_pear = yes
+PreReq: kolabd >= 2.1.0-20070417, kolab-horde-framework >= 2.1.0-20070417, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Tue Apr 17 16:44:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 16:44:38 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin configure.ac,1.24,1.25
Message-ID: <20070417144438.1CA961005CE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv19953/kolab-webadmin/kolab-webadmin
Modified Files:
configure.ac
Log Message:
Bumped version numbers from 2.0.99 to 2.1.0 in preparation for 2.1rc2
Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- configure.ac 10 Nov 2006 18:36:00 -0000 1.24
+++ configure.ac 17 Apr 2007 14:44:36 -0000 1.25
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-m4_define(_VERSION,2.0.99)
+m4_define(_VERSION,2.1.0)
AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel at kolab.org])
AC_CONFIG_SRCDIR(php/admin/include/ldap.class.php)
AC_CONFIG_AUX_DIR(.)
From cvs at kolab.org Tue Apr 17 16:44:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 16:44:38 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd configure.ac,1.8,1.9
Message-ID: <20070417144438.1F2491006AA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv19953/kolabd/kolabd
Modified Files:
configure.ac
Log Message:
Bumped version numbers from 2.0.99 to 2.1.0 in preparation for 2.1rc2
Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.ac 14 Jan 2006 22:16:20 -0000 1.8
+++ configure.ac 17 Apr 2007 14:44:36 -0000 1.9
@@ -1,7 +1,7 @@
AC_PREREQ(2.59)
# not the real version
-m4_define(_VERSION,2.0.99)
+m4_define(_VERSION,2.1.0)
AC_INIT([kolabd],[_VERSION],[kolab-devel at kolab.org])
AC_CONFIG_AUX_DIR(.)
From cvs at kolab.org Tue Apr 17 17:16:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 17:16:20 +0200 (CEST)
Subject: thomas: server/kolab-horde-framework kolab-horde-framework.spec, 1.6,
1.7
Message-ID: <20070417151620.C40CA1005CE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-horde-framework
In directory doto:/tmp/cvs-serv20804/kolab-horde-framework
Modified Files:
kolab-horde-framework.spec
Log Message:
Fixed missing change for one date stamp
Index: kolab-horde-framework.spec
===================================================================
RCS file: /kolabrepository/server/kolab-horde-framework/kolab-horde-framework.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab-horde-framework.spec 17 Apr 2007 14:44:36 -0000 1.6
+++ kolab-horde-framework.spec 17 Apr 2007 15:16:18 -0000 1.7
@@ -8,7 +8,7 @@
URL: http://www.kolab.org/
Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB)
Version: %{V_kolab_horde}
-Release: 20051220
+Release: 20070417
Class: JUNK
License: GPL
Group: MAIL
From cvs at kolab.org Tue Apr 17 18:01:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 18:01:56 +0200 (CEST)
Subject: thomas: server/kolab-horde-fbview kolab-horde-fbview.spec,1.5,1.6
Message-ID: <20070417160156.00D2E1006AF@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-horde-fbview
In directory doto:/tmp/cvs-serv21938/kolab-horde-fbview
Modified Files:
kolab-horde-fbview.spec
Log Message:
Fixed missing change for one date stamp
Index: kolab-horde-fbview.spec
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab-horde-fbview.spec 17 Apr 2007 14:44:35 -0000 1.5
+++ kolab-horde-fbview.spec 17 Apr 2007 16:01:53 -0000 1.6
@@ -7,7 +7,7 @@
URL: http://www.kolab.org/
Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB)
Version: %{V_kolab_fbview}
-Release: 20070112
+Release: 20070417
Class: JUNK
License: GPL
Group: MAIL
From cvs at kolab.org Tue Apr 17 18:04:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 18:04:20 +0200 (CEST)
Subject: thomas: server Makefile,1.13,1.14
Message-ID: <20070417160420.575B01006AF@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv22050
Modified Files:
Makefile
Log Message:
Make echo "foo!" sh-safe by using single quotes
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile 14 Feb 2007 17:46:40 -0000 1.13
+++ Makefile 17 Apr 2007 16:04:18 -0000 1.14
@@ -16,4 +16,4 @@
cd kolab-resource-handlers && make dist
cd php-smarty && make dist
cd kolab-webadmin && make dist
- cd stage && cp ../obmtool ../obmtool.conf ../README.1st . && echo "Remember to update obmtool.conf!"
+ cd stage && cp ../obmtool ../obmtool.conf ../README.1st . && echo 'Remember to update obmtool.conf!'
From cvs at kolab.org Tue Apr 17 18:46:18 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 18:46:18 +0200 (CEST)
Subject: thomas: server Makefile,1.14,1.15
Message-ID: <20070417164618.56D701005AE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23091
Modified Files:
Makefile
Log Message:
Added spamassassin to global Makefile
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile 17 Apr 2007 16:04:18 -0000 1.14
+++ Makefile 17 Apr 2007 16:46:16 -0000 1.15
@@ -2,6 +2,7 @@
rm -rf stage
mkdir stage
cd file && make dist
+ cd spamassassin && make dist
cd clamav && make dist
cd imap && make dist
cd apache && make dist
From cvs at kolab.org Tue Apr 17 19:09:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 19:09:59 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates clamd.conf.template.in, 1.2,
1.3
Message-ID: <20070417170959.5A9481005DC@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv23900/templates
Modified Files:
clamd.conf.template.in
Log Message:
Add ScanPDF option (new in clamav 0.90.2)
Index: clamd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/clamd.conf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- clamd.conf.template.in 14 Feb 2007 17:44:17 -0000 1.2
+++ clamd.conf.template.in 17 Apr 2007 17:09:57 -0000 1.3
@@ -208,6 +208,10 @@
# Default: yes
#ScanOLE2 yes
+# This option enables scanning within PDF files.
+# Default: no
+#ScanPDF yes
+
##
## Mail files
##
From cvs at kolab.org Tue Apr 17 19:09:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Apr 2007 19:09:59 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.92,1.93
Message-ID: <20070417170959.5794C1005D2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv23900
Modified Files:
ChangeLog
Log Message:
Add ScanPDF option (new in clamav 0.90.2)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- ChangeLog 12 Apr 2007 11:52:24 -0000 1.92
+++ ChangeLog 17 Apr 2007 17:09:57 -0000 1.93
@@ -1,3 +1,7 @@
+2007-04-17 Thomas Arendsen Hein
+
+ * templates/clamd.conf.template.in: Add ScanPDF option (clamav 0.90.2)
+
2007-04-12 Gunnar Wrobel
* templates/cyrus.conf.template.in (OWNERSHIP):
From cvs at kolab.org Wed Apr 18 18:42:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 18 Apr 2007 18:42:01 +0200 (CEST)
Subject: thomas: server README.1st,1.52,1.53
Message-ID: <20070418164201.1EB801005A3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv11296
Modified Files:
README.1st
Log Message:
Added instructions for regenerating the free/busy cache (gdbm->db4)
Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- README.1st 13 Apr 2007 17:31:54 -0000 1.52
+++ README.1st 18 Apr 2007 16:41:58 -0000 1.53
@@ -265,7 +265,23 @@
Upgrade from 2.1-rc-1
---------------------
-FIXME
+The database backend for the free/busy cache was changed to solve licensing
+issues between php4+ and gdbm. See kolab/issue1607 for details.
+
+The old cache file has to be deleted manually:
+
+ rm /kolab/var/kolab/www/freebusy/cache/pfbcache.db
+
+Then updating the free/busy cache has to be triggered for all calendar
+folders of all accounts:
+- Users need to create or update an appointment in their folders.
+- Resources can be invited to a new appointment or send them an update
+ to an existing appointment.
+
+Alternatively you can trigger each folder with an https request:
+https://[server]/freebusy/trigger/[email]/[path_to_calendar_folder].pfb,
+e.g. https://kolab.example.com/freebusy/trigger/user at example.com/Calendar.pfb
+(you need to authenticate with the user's credentials)
Known problems and workarounds
From cvs at kolab.org Thu Apr 19 11:41:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Apr 2007 11:41:46 +0200 (CEST)
Subject: thomas: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.10,
1.11
Message-ID: <20070419094146.4DF2C1006AA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/raw-howtos
In directory doto:/tmp/cvs-serv12320
Modified Files:
kolab_2.0_to_2.1_upgrade_instructions.txt
Log Message:
Indicate root or user for commands. Use umask 077 for handling ldifs.
(on many systems /root is world-readable)
Index: kolab_2.0_to_2.1_upgrade_instructions.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab_2.0_to_2.1_upgrade_instructions.txt 20 Feb 2007 14:35:32 -0000 1.10
+++ kolab_2.0_to_2.1_upgrade_instructions.txt 19 Apr 2007 09:41:44 -0000 1.11
@@ -15,27 +15,29 @@
1. Stop the Kolab Server and related cronjobs:
- Comment out all OpenPKG entries in /etc/crontab, then run:
+ Comment out all OpenPKG entries in /etc/crontab, then run:
- /kolab/bin/openpkg rc all stop
+ # /kolab/bin/openpkg rc all stop
2. Backup the old installation:
- You could use rsync on the running server and then rsync again
- to transfer only changed files to keep the downtime short.
+ You could use rsync on the running server and then rsync again
+ to transfer only changed files to keep the downtime short.
3. Extract ldap data:
- Copy the contents of the openldap database (use a different output
- filename if you want):
+ Copy the contents of the openldap database, use a different output
+ filename if you want. You should make sure that no other users can
+ read the sensitive data contained in the ldif file, e.g. with umask:
- /kolab/sbin/slapcat > ~/kolab-2.0.ldif
+ # umask 077
+ # /kolab/sbin/slapcat > ~/kolab-2.0.ldif
4. Prepare for berkeley db update
- cd /kolab/var/imapd/db
- /kolab/bin/db_recover
- rm /kolab/var/imapd/db/*
+ # cd /kolab/var/imapd/db
+ # /kolab/bin/db_recover
+ # rm /kolab/var/imapd/db/*
Installation
@@ -61,7 +63,7 @@
renamed. There might be more files with the .rpmsave ending in
/kolab/etc, you can find them for example using the find command:
-find /kolab/etc -name '*.rpmsave'
+ # find /kolab/etc -name '*.rpmsave'
Any files found must be checked and moved out of the way, in most
cases they can just be deleted.
@@ -94,15 +96,15 @@
To convert the databases to berkeley db format, execute as root:
-su - kolab-r
-cd /kolab/var/imapd/
-mv annotations.db annotations.db-skiplist
-/kolab/bin/cvt_cyrusdb /kolab/var/imapd/annotations.db-skiplist skiplist \
- /kolab/var/imapd/annotations.db berkeley
-mv mailboxes.db mailboxes.db-skiplist
-/kolab/bin/cvt_cyrusdb /kolab/var/imapd/mailboxes.db-skiplist skiplist \
- /kolab/var/imapd/mailboxes.db berkeley
-exit
+ # su - kolab-r
+ $ cd /kolab/var/imapd/
+ $ mv annotations.db annotations.db-skiplist
+ $ cvt_cyrusdb /kolab/var/imapd/annotations.db-skiplist skiplist \
+ /kolab/var/imapd/annotations.db berkeley
+ $ mv mailboxes.db mailboxes.db-skiplist
+ $ cvt_cyrusdb /kolab/var/imapd/mailboxes.db-skiplist skiplist \
+ /kolab/var/imapd/mailboxes.db berkeley
+ $ exit
See http://wiki.kolab.org/index.php/Kolab2_IMAPD_annotations.db_Problems
for details about this topic.
@@ -136,13 +138,14 @@
The script works on the ldif data that was exported with slapcat earlier,
it requires python-ldap:
- python convert-ldif-21.py ~/kolab-2.0.ldif ~/kolab-2.1.ldif
+ # umask 077
+ # python convert-ldif-21.py ~/kolab-2.0.ldif ~/kolab-2.1.ldif
Then restore the openldap data using the output from convert-ldif-21.py:
- rm /kolab/var/openldap/openldap-data/*
- /kolab/sbin/slapadd -l ~/kolab-2.1.ldif
+ # rm /kolab/var/openldap/openldap-data/*
+ # /kolab/sbin/slapadd -l ~/kolab-2.1.ldif
This will issue some warnings which can be safely ignored.
@@ -151,8 +154,8 @@
Now start the openldap server and run kolabconf
- /kolab/bin/openpkg rc openldap start
- /kolab/sbin/kolabconf
+ # /kolab/bin/openpkg rc openldap start
+ # /kolab/sbin/kolabconf
Kolabconf might complain about be some files ending .rpmnew under
@@ -165,7 +168,7 @@
Now you should be able to start the server again:
- /kolab/bin/openpkg rc all start
+ # /kolab/bin/openpkg rc all start
Resource Accounts
@@ -180,7 +183,7 @@
done using the convert-ldif-21.py script, which was introduced in the
section on converting the LDAP data.
- python convert-ldif-21.py --list-resources ~/kolab-2.0.ldif
+ # python convert-ldif-21.py --list-resources ~/kolab-2.0.ldif
lists the UIDs (normally the email addresses) of all resource accounts.
@@ -190,14 +193,14 @@
Connect with cyradm to the Kolab imap server as user manager:
- /kolab/bin/cyradm -u manager localhost
+ # /kolab/bin/cyradm -u manager localhost
Then use the `setaclmailbox' command (sam) to set the necessary
permissions. You can generate a list of commands which should do the
right thing on most standard installations with:
- python convert-ldif-21.py --list-resources ~/kolab-2.0.ldif | \
- sed 's-\(.*\)\(@.*\)-sam */\1*\2 calendar\2 all-'
+ # python convert-ldif-21.py --list-resources ~/kolab-2.0.ldif | \
+ sed 's-\(.*\)\(@.*\)-sam */\1*\2 calendar\2 all-'
Final Steps
@@ -212,7 +215,7 @@
2. Kolab 2.1 doesn't need some of the OpenPKG packages which were
installed for 2.0, these can be removed:
- /kolab/bin/openpkg rpm -e dcron vim pth
+ # /kolab/bin/openpkg rpm -e dcron vim pth
Especially the dcron package should be removed in any case,
otherwise deprecated cronjobs will be run and generate mails with
From cvs at kolab.org Thu Apr 19 19:26:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Apr 2007 19:26:33 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates main.cf.template.in, 1.14,
1.15
Message-ID: <20070419172633.752461006A9@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv24788/templates
Modified Files:
main.cf.template.in
Log Message:
Reformatted smtpd_recipient_restrictions and smtpd_sender_restrictions
While this doesn't fix a bug, it makes these lines easier to understand and
maintain, e.g. when you want to insert permit_sasl_authenticated in
smtpd_sender_restrictions.
Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- main.cf.template.in 22 Mar 2007 18:12:52 -0000 1.14
+++ main.cf.template.in 19 Apr 2007 17:26:31 -0000 1.15
@@ -137,9 +137,11 @@
# authentication via sasl
## Kolab Policy Server
-smtpd_recipient_restrictions = permit_mynetworks,permit_sasl_authenticated,
- reject_unauth_destination, reject_unlisted_recipient, check_policy_service unix:private/kolabpolicy
-smtpd_sender_restrictions = permit_mynetworks, check_policy_service unix:private/kolabpolicy
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated,
+ reject_unauth_destination, reject_unlisted_recipient,
+ check_policy_service unix:private/kolabpolicy
+smtpd_sender_restrictions = permit_mynetworks,
+ check_policy_service unix:private/kolabpolicy
kolabpolicy_time_limit = 3600
kolabpolicy_max_idle = 20
From cvs at kolab.org Fri Apr 20 12:24:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 12:24:33 +0200 (CEST)
Subject: thomas: server README.1st,1.53,1.54
Message-ID: <20070420102433.808F51005D2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23141
Modified Files:
README.1st
Log Message:
Added new workaround for issue1068 (rm /kolab/var/kolab/mailbox-uidcache.db)
(see msg10228 in kolab/issue1068)
Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- README.1st 18 Apr 2007 16:41:58 -0000 1.53
+++ README.1st 20 Apr 2007 10:24:31 -0000 1.54
@@ -301,6 +301,9 @@
/kolab/bin/openpkg rc kolabd restart
+ If user accounts are still not created or deleted, you can try removing
+ the file /kolab/var/kolab/mailbox-uidcache.db and restarting kolabd.
+
See kolab/issue1068 (Mailboxes are not created until kolabd restart)
and kolab/issue1098 (Changes in the service tab are not accepted after
bootstrap) for details.
From cvs at kolab.org Fri Apr 20 16:07:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 16:07:57 +0200 (CEST)
Subject: thomas: server/perl-kolab perl-kolab.spec.in,1.30,1.31
Message-ID: <20070420140757.441BB1005CA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv28107/perl-kolab
Modified Files:
perl-kolab.spec.in
Log Message:
Removed gdbm requirement from kolab-webadmin and adjusted other requirements.
Index: perl-kolab.spec.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- perl-kolab.spec.in 14 Jan 2006 22:16:43 -0000 1.30
+++ perl-kolab.spec.in 20 Apr 2007 14:07:55 -0000 1.31
@@ -46,8 +46,8 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
# BuildPreReq: OpenPKG, openpkg >= 2.0, perl >= @VERSION@, perl-openpkg >= @VERSION@
-BuildPreReq: OpenPKG, openpkg >= 2.0
-PreReq: OpenPKG, openpkg >= 2.2.0, perl >= @VERSION@, perl-openpkg >= @VERSION@, perl-db, perl-mail, perl-ldap
+BuildPreReq: OpenPKG, openpkg >= 2.5.0
+PreReq: OpenPKG, openpkg >= 2.5.0, perl >= @VERSION@, perl-openpkg >= @VERSION@, perl-db, perl-mail, perl-ldap
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Apr 20 16:07:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 16:07:57 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin kolab-webadmin.spec.in,
1.16, 1.17
Message-ID: <20070420140757.2D6D61005A3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv28107/kolab-webadmin/kolab-webadmin
Modified Files:
kolab-webadmin.spec.in
Log Message:
Removed gdbm requirement from kolab-webadmin and adjusted other requirements.
Index: kolab-webadmin.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- kolab-webadmin.spec.in 20 Jun 2006 12:28:57 -0000 1.16
+++ kolab-webadmin.spec.in 20 Apr 2007 14:07:54 -0000 1.17
@@ -41,9 +41,9 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.0.0
-PreReq: OpenPKG, openpkg >= 2.2.0, kolabd >= 1.9.4-20050606
-PreReq: apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
+BuildPreReq: OpenPKG, openpkg >= 2.5.0
+PreReq: OpenPKG, openpkg >= 2.5.0, kolabd >= 2.1.0-20070420
+PreReq: apache >= 1.3.33-2.5.0, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_bdb = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
PreReq: php-smarty >= 2.6.3
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Apr 20 16:07:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 16:07:57 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd kolabd.spec.in,1.6,1.7
Message-ID: <20070420140757.3CEAD1005B5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv28107/kolabd/kolabd
Modified Files:
kolabd.spec.in
Log Message:
Removed gdbm requirement from kolab-webadmin and adjusted other requirements.
Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabd.spec.in 28 Mar 2007 01:51:35 -0000 1.6
+++ kolabd.spec.in 20 Apr 2007 14:07:55 -0000 1.7
@@ -49,15 +49,15 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.0.0
-PreReq: OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.23-2.3.0_kolab2, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
+BuildPreReq: OpenPKG, openpkg >= 2.5.0
+PreReq: OpenPKG, openpkg >= 2.5.0, openldap >= 2.3.29, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
PreReq: sasl >= 2.1.19-2.2.0, sasl::with_ldap = yes, sasl::with_login = yes
PreReq: proftpd >= 1.2.10-2.2.0, proftpd::with_ldap = yes
-PreReq: postfix >= 2.1.5-2.2.0_kolab3, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
-PreReq: imapd >= 2.2.8-2.2.0_kolab, imapd::with_group = yes
-PreReq: apache >= 1.3.31-2.2.0, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
-PreReq: perl-kolab >= 5.8.7-20050728, perl-db
-PreReq: amavisd >= 2.3.1-2.4.0
+PreReq: postfix >= 2.2.5, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
+PreReq: imapd >= 2.2.12-2.5.0, imapd::with_group = yes
+PreReq: apache >= 1.3.33-2.5.0, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
+PreReq: perl-kolab >= 5.8.7-20070417, perl-db
+PreReq: amavisd >= 2.3.3-2.5.0
PreReq: clamav >= 0.90-20070214
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Apr 20 16:56:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 16:56:12 +0200 (CEST)
Subject: thomas: server/kolab-horde-fbview Makefile, 1.4,
1.5 kolab-horde-fbview.spec, 1.6, 1.7
Message-ID: <20070420145612.B3A3E1005B3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-horde-fbview
In directory doto:/tmp/cvs-serv29205/kolab-horde-fbview
Modified Files:
Makefile kolab-horde-fbview.spec
Log Message:
Updated version numbers for 2.1rc2
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 17 Apr 2007 14:44:35 -0000 1.4
+++ Makefile 20 Apr 2007 14:56:10 -0000 1.5
@@ -4,7 +4,7 @@
PACKAGE = kolab-horde-fbview
VERSION = 2.1.0
-RELEASE = 20070417
+RELEASE = 20070420
KOLABRELEASE = $(RELEASE)
RPM = /kolab/bin/openpkg rpm
Index: kolab-horde-fbview.spec
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab-horde-fbview.spec 17 Apr 2007 16:01:53 -0000 1.6
+++ kolab-horde-fbview.spec 20 Apr 2007 14:56:10 -0000 1.7
@@ -7,7 +7,7 @@
URL: http://www.kolab.org/
Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB)
Version: %{V_kolab_fbview}
-Release: 20070417
+Release: 20070420
Class: JUNK
License: GPL
Group: MAIL
@@ -20,7 +20,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
-PreReq: kolabd >= 2.1.0-20070417, kolab-horde-framework >= 2.1.0-20070417, apache, php, php::with_pear = yes
+PreReq: kolabd >= 2.1.0-20070420, kolab-horde-framework >= 2.1.0-20070420, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Fri Apr 20 16:56:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 16:56:12 +0200 (CEST)
Subject: thomas: server obmtool.conf,1.250,1.251
Message-ID: <20070420145612.ACCCD1005A3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv29205
Modified Files:
obmtool.conf
Log Message:
Updated version numbers for 2.1rc2
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- obmtool.conf 17 Apr 2007 14:44:35 -0000 1.250
+++ obmtool.conf 20 Apr 2007 14:56:10 -0000 1.251
@@ -24,7 +24,7 @@
%kolab
echo "---- boot/build ${NODE} %${CMD} ----"
- kolab_version="2.1rc1+cvs";
+ kolab_version="2.1rc2";
PREFIX=/${CMD};
loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
plusloc='+'
@@ -155,12 +155,12 @@
@install ${loc}bc-1.06-2.5.0
@install ${loc}pkgconfig-0.19-2.5.0
@install ${altloc}clamav-0.90.2-20070413_kolab
- @install ${altloc}perl-kolab-5.8.7-20070417
- @install ${altloc}kolabd-2.1.0-20070417 --define kolab_version=$kolab_version
- @install ${altloc}kolab-webadmin-2.1.0-20070417 --define kolab_version=$kolab_version
- @install ${altloc}kolab-horde-framework-2.1.0-20070417 --define kolab_version=$kolab_version
- @install ${altloc}kolab-resource-handlers-2.1.0-20070417 --define kolab_version=$kolab_version
- @install ${altloc}kolab-horde-fbview-2.1.0-20070417 --define kolab_version=$kolab_version
+ @install ${altloc}perl-kolab-5.8.7-20070420
+ @install ${altloc}kolabd-2.1.0-20070420 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-webadmin-2.1.0-20070420 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-horde-framework-2.1.0-20070420 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-resource-handlers-2.1.0-20070420 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-horde-fbview-2.1.0-20070420 --define kolab_version=$kolab_version
@check
if test ! -e "/usr/bin/kolab" ; then
From cvs at kolab.org Fri Apr 20 16:56:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 16:56:12 +0200 (CEST)
Subject: thomas: server/kolab-horde-framework Makefile, 1.4,
1.5 kolab-horde-framework.spec, 1.7, 1.8
Message-ID: <20070420145612.B933F1005B5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-horde-framework
In directory doto:/tmp/cvs-serv29205/kolab-horde-framework
Modified Files:
Makefile kolab-horde-framework.spec
Log Message:
Updated version numbers for 2.1rc2
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-horde-framework/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 17 Apr 2007 14:44:36 -0000 1.4
+++ Makefile 20 Apr 2007 14:56:10 -0000 1.5
@@ -5,7 +5,7 @@
PACKAGE = kolab-horde-framework
VERSION = 2.1.0
-RELEASE = 20070417
+RELEASE = 20070420
KOLABRELEASE = $(RELEASE)
PEARVERSION = 1.3
Index: kolab-horde-framework.spec
===================================================================
RCS file: /kolabrepository/server/kolab-horde-framework/kolab-horde-framework.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab-horde-framework.spec 17 Apr 2007 15:16:18 -0000 1.7
+++ kolab-horde-framework.spec 20 Apr 2007 14:56:10 -0000 1.8
@@ -8,7 +8,7 @@
URL: http://www.kolab.org/
Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB)
Version: %{V_kolab_horde}
-Release: 20070417
+Release: 20070420
Class: JUNK
License: GPL
Group: MAIL
@@ -22,7 +22,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
-PreReq: kolabd >= 2.1.0-20070417, apache, php, php::with_pear = yes
+PreReq: kolabd >= 2.1.0-20070420, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Fri Apr 20 16:56:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 16:56:12 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd kolabd.spec.in,1.7,1.8
Message-ID: <20070420145612.C11661005CA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv29205/kolabd/kolabd
Modified Files:
kolabd.spec.in
Log Message:
Updated version numbers for 2.1rc2
Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolabd.spec.in 20 Apr 2007 14:07:55 -0000 1.7
+++ kolabd.spec.in 20 Apr 2007 14:56:10 -0000 1.8
@@ -56,7 +56,7 @@
PreReq: postfix >= 2.2.5, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
PreReq: imapd >= 2.2.12-2.5.0, imapd::with_group = yes
PreReq: apache >= 1.3.33-2.5.0, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
-PreReq: perl-kolab >= 5.8.7-20070417, perl-db
+PreReq: perl-kolab >= 5.8.7-20070420, perl-db
PreReq: amavisd >= 2.3.3-2.5.0
PreReq: clamav >= 0.90-20070214
AutoReq: no
From cvs at kolab.org Fri Apr 20 16:56:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 16:56:12 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers
kolab-resource-handlers.spec.in, 1.5, 1.6
Message-ID: <20070420145612.C1BF21005D2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers
In directory doto:/tmp/cvs-serv29205/kolab-resource-handlers/kolab-resource-handlers
Modified Files:
kolab-resource-handlers.spec.in
Log Message:
Updated version numbers for 2.1rc2
Index: kolab-resource-handlers.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/kolab-resource-handlers.spec.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab-resource-handlers.spec.in 17 Apr 2007 14:44:36 -0000 1.5
+++ kolab-resource-handlers.spec.in 20 Apr 2007 14:56:10 -0000 1.6
@@ -20,7 +20,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
-PreReq: kolabd >= 2.1.0-20070417, kolab-horde-framework >= 2.1.0-20070417, apache, php, php::with_pear = yes
+PreReq: kolabd >= 2.1.0-20070420, kolab-horde-framework >= 2.1.0-20070420, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Fri Apr 20 17:01:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 17:01:07 +0200 (CEST)
Subject: thomas: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.11,
1.12
Message-ID: <20070420150107.E3CC41005A3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/raw-howtos
In directory doto:/tmp/cvs-serv29371
Modified Files:
kolab_2.0_to_2.1_upgrade_instructions.txt
Log Message:
Updated server 2.0->2.1 upgrade instructions
Index: kolab_2.0_to_2.1_upgrade_instructions.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolab_2.0_to_2.1_upgrade_instructions.txt 19 Apr 2007 09:41:44 -0000 1.11
+++ kolab_2.0_to_2.1_upgrade_instructions.txt 20 Apr 2007 15:01:05 -0000 1.12
@@ -1,12 +1,9 @@
Upgrade Kolab Server from 2.0.x to 2.1
======================================
-Preliminary instructions for the upgrade of a Kolab Server from version
-2.0.x to Kolab Server 2.1.
+Instructions for upgrading Kolab Server 2.0.4 to 2.1.0
-NOTE: This is an early version of the upgrade instructions. It is not
-very well tested and may not cover all problems that may occur during
-the upgrade. Before attempting the upgrade, make sure you have a
+NOTE: Before attempting the upgrade, make sure you have a
current and working backup of your data.
@@ -223,5 +220,21 @@
3. Activate the entries for OpenPKG in /etc/crontab again.
+4. The database backend for the free/busy cache was changed to solve licensing
+ issues between php4+ and gdbm. See kolab/issue1607 for details.
+ The old cache file has to be deleted manually:
+
+ # rm /kolab/var/kolab/www/freebusy/cache/pfbcache.db
+
+ Then updating the free/busy cache has to be triggered for all calendar
+ folders of all accounts:
+ - Users need to create or update an appointment in their folders.
+ - Resources can be invited to a new appointment or send them an update
+ to an existing appointment.
+
+ Alternatively you can trigger each folder with an https request:
+ https://[server]/freebusy/trigger/[email]/[path_to_calendar_folder].pfb,
+ e.g. https://kolab.example.com/freebusy/trigger/user at example.com/Calendar.pfb
+ (you need to authenticate with the user's credentials)
$Id$
From cvs at kolab.org Fri Apr 20 17:06:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 17:06:24 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.100,1.101
Message-ID: <20070420150624.15C731005A3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv29711
Modified Files:
release-notes.txt
Log Message:
Updated last bits of release notes for 2.1rc2
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- release-notes.txt 17 Apr 2007 14:05:17 -0000 1.100
+++ release-notes.txt 20 Apr 2007 15:06:22 -0000 1.101
@@ -1,16 +1,15 @@
Release notes Kolab2 Server
-(Version 20070???, Kolab Server 2.1 rc 1 + CVS)
+(Version 20070420, Kolab Server 2.1 rc 2)
This is a development snapshot of the kolab server leading up to a 2.1
release. For upgrading and installation instructions, please refer to
the 1st.README file in the source directory.
-These topics need testing in 2.1 rc 1:
+These topics need testing in 2.1 rc 2:
- Upgrades from Kolab server 2.0, see 1st.README and UPGRADING.20-21.
- - Changed imapd database format for annotations.db and mailboxes.db
- New free/busy code
- - Duplicate suppression is disabled, see kolab/issue1532
+ - New database backend for the free/busy cache
Differences between Kolab 2.0.x and 2.1:
@@ -62,11 +61,11 @@
Ignore headers inserted on the receiving side for bayes filtering.
- - perl-kolab-5.8.7-20070???
+ - perl-kolab-5.8.7-20070420
Added debug option for verbose logging to stderr.
- - kolabd-2.1.0-20070???
+ - kolabd-2.1.0-20070420
Fix the path to the freebusy directory for non-OpenPKG installations.
@@ -87,9 +86,11 @@
kolab/issue1638 (kolabconf generates broken resmgr.conf)
kolab/issue1680 (/kolab/bin/kolab fix)
- - kolab-horde-fbview-2.1.0-20070???
+ - kolab-horde-fbview-2.1.0-20070420
- - kolab-resource-handlers-2.1.0-20070???
+ Updated version number, no other changes since 2.1rc1
+
+ - kolab-resource-handlers-2.1.0-20070420
Improved logging for opening pfbcache.db
@@ -97,7 +98,7 @@
kolab/issue1607 (need to replace gdbm for pfbcache, because of license clash gdbm vs php)
kolab/issue1659 (Freebusy assumes that all day events last exactly one day)
- - kolab-webadmin-2.1.0-20070???
+ - kolab-webadmin-2.1.0-20070420
Updated Dutch and German translations.
From cvs at kolab.org Fri Apr 20 17:28:30 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 17:28:30 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.101,1.102
Message-ID: <20070420152830.691BB1005A3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv30122
Modified Files:
release-notes.txt
Log Message:
Bumped php release number, added apache and php changes to release notes.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- release-notes.txt 20 Apr 2007 15:06:22 -0000 1.101
+++ release-notes.txt 20 Apr 2007 15:28:28 -0000 1.102
@@ -36,6 +36,10 @@
Changes since 2.1 rc 1:
+ - apache-1.3.33-2.5.6_kolab2
+
+ kolab/issue1607 (need to replace gdbm for pfbcache, because of license clash gdbm vs php)
+
- clamav-0.90.2-20070413_kolab
New upstream version, fixes various security issues.
@@ -50,6 +54,10 @@
New upstream version.
kolab/issue1172 (Cyrus Imapd dies when logfile exceeds 2 GiB)
+
+ - php-4.4.0-2.5.2_kolab2
+
+ kolab/issue1607 (need to replace gdbm for pfbcache, because of license clash gdbm vs php)
- spamassassin-3.1.0-2.5.1_kolab
From cvs at kolab.org Fri Apr 20 17:28:30 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 17:28:30 +0200 (CEST)
Subject: thomas: server/php Makefile,1.6,1.7 kolab.patch,1.3,1.4
Message-ID: <20070420152830.6D5351005B3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv30122/php
Modified Files:
Makefile kolab.patch
Log Message:
Bumped php release number, added apache and php changes to release notes.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 2 Mar 2007 04:33:17 -0000 1.6
+++ Makefile 20 Apr 2007 15:28:28 -0000 1.7
@@ -14,7 +14,7 @@
PACKAGE=php
VERSION=4.4.0
RELEASE=2.5.2
-KOLABRELEASE=2.5.2_kolab
+KOLABRELEASE=2.5.2_kolab2
RPM=/kolab/bin/openpkg rpm
KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab.patch 9 Dec 2005 15:56:24 -0000 1.3
+++ kolab.patch 20 Apr 2007 15:28:28 -0000 1.4
@@ -5,7 +5,7 @@
License: PHP
Version: %{V_php}
-Release: 2.5.2
-+Release: 2.5.2_kolab
++Release: 2.5.2_kolab2
# package options
%option with_bc no
From cvs at kolab.org Fri Apr 20 17:31:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 17:31:09 +0200 (CEST)
Subject: thomas: server obmtool.conf,1.251,1.252
Message-ID: <20070420153109.6AEC51005A3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv30211
Modified Files:
obmtool.conf
Log Message:
bumped php release number in obmtool.conf, too
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- obmtool.conf 20 Apr 2007 14:56:10 -0000 1.251
+++ obmtool.conf 20 Apr 2007 15:31:07 -0000 1.252
@@ -136,7 +136,7 @@
--with=mod_php_dom \
--with=mod_ssl \
--with=mod_php_mbstring
- @trigger ${altloc}php-4.4.0-2.5.2_kolab \
+ @trigger ${altloc}php-4.4.0-2.5.2_kolab2 \
--with=zlib \
--with=bdb \
--with=gettext \
From cvs at kolab.org Fri Apr 20 19:34:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 19:34:01 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.113,1.114
Message-ID: <20070420173401.4EEF21005D2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv413
Modified Files:
index.html.m4
Log Message:
Announcement for server 2.1rc2 (and fixed formatting of news entries)
Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- index.html.m4 31 Mar 2007 12:45:11 -0000 1.113
+++ index.html.m4 20 Apr 2007 17:33:59 -0000 1.114
@@ -33,23 +33,43 @@
-
+
+April 20th, 2007
+»
+ Kolab Server 2.1 Release Candidate 2 released
+
+
+
+
+ This release fixes more than 20 problems found in RC 1 and contains updated translations.
+ Some security issues were fixed in clamav, spamassassin and file.
+ See the
+
+ announcement for details.
+
+
+
+
March 22nd, 2007
-»KDAB sponsors Horde Development
+
»
+ KDAB sponsors Horde Development
+
+
+
@@ -58,7 +78,7 @@
Konsortium, KDAB now contracts Gunnar Wrobel of P at rdus to accelerate
development of the Horde web client, the preferred web client for the Kolab
solution. Gunnar will also maintain community relations on behalf of KDAB.
- Read the announcement
+ Read the announcement
@@ -66,35 +86,46 @@
- March 15th - 21st, 2007
- »CeBIT 2007 - Kolab based events
+
March 15th - 21st, 2007
+»
+ CeBIT 2007 - Kolab based events
+
+
+
-
+
Bernhard Reiter will be representing Intevation and the Kolab Konsortium at the "Open Source for small business - ExChange alternatives put to test" panel-discussion.
-CeBIT SME Forum - Hall 5, Booth B48, March 21st, 3.15pm - 4.30pm
+CeBIT SME Forum - Hall 5, Booth B48, March 21st, 3.15pm - 4.30pm
The Kolab-Konsortium Business Partner Univention will be presenting the Kolab based Univention Groupware Server (UGS) at Cebit.
-CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover (in German)
+CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover (in German)
Univention will also give a talk about "Migration to a free Groupware Server - Microsoft Exchange to Kolab2" as part of the IX Forum Software & Systems discussion.
-CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm (in German)
+CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm (in German)
-
+
-
-
- February 12th 2007
- »New KDE Kolab Client released, revision 'proko2.1.6'.
+
+February 12th 2007
+»
+ New KDE Kolab Client released, revision 'proko2.1.6'.
+
+
+
- This release contains several fixes and a few new features.
- See the
announcement for details.
-
+ This release contains several fixes and a few new features.
+ See the announcement for details.
+
+
+
+
+
February 5th, 2007
@@ -111,10 +142,6 @@
-
-
-
-
January 17th, 2007
From cvs at kolab.org Fri Apr 20 19:36:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Apr 2007 19:36:28 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.114,1.115
Message-ID: <20070420173628.114B21005D2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv704
Modified Files:
index.html.m4
Log Message:
more fixes to news from March 22nd, 2007
Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- index.html.m4 20 Apr 2007 17:33:59 -0000 1.114
+++ index.html.m4 20 Apr 2007 17:36:26 -0000 1.115
@@ -65,22 +65,18 @@
March 22nd, 2007
-»
+ »
KDAB sponsors Horde Development
-
-
In an effort to further increase the quality and usefulness of the Kolab
Groupware Solution, jointly developed by KDAB with its partners in the Kolab
Konsortium , KDAB now contracts Gunnar Wrobel of P at rdus to accelerate
development of the Horde web client, the preferred web client for the Kolab
solution. Gunnar will also maintain community relations on behalf of KDAB.
Read the announcement
-
-
From cvs at kolab.org Mon Apr 23 14:44:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Apr 2007 14:44:56 +0200 (CEST)
Subject: bernhard: doc/www/src mirrors.html.m4,1.18,1.19
Message-ID: <20070423124456.0330A1006B7@lists.intevation.de>
Author: bernhard
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv25727
Modified Files:
mirrors.html.m4
Log Message:
Adapted message about binary availability. It now states that
before 2.1 rc2 there are no binaries because of the php licensing problems
and the message is after the mirrors now.
Index: mirrors.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mirrors.html.m4 5 Apr 2007 15:27:18 -0000 1.18
+++ mirrors.html.m4 23 Apr 2007 12:44:53 -0000 1.19
@@ -4,13 +4,6 @@
Kolab Downloads
-
- Currently there are no binary packages available for the Kolab server due
- to licensing issues with PHP4, see
- kolab/issue1607
- for details. This will be corrected with the next server release.
-
-
@@ -42,6 +35,14 @@
Marko Uskokovic System Administrator email: uskokovic ,a, etf.bg.ac.yu
-->
+
+
+ For server versions before 2.1 rc2 there are no binaries available
+ because of licensing issues with PHP4, see
+ kolab/issue1607
+ for details.
+
+
How to become a mirror?
You need to be able to use rsync with the options to preserve soft links.
From cvs at kolab.org Tue Apr 24 18:19:13 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Apr 2007 18:19:13 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.102,1.103 README.1st,1.54,1.55
Message-ID: <20070424161913.C35BE1005CF@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv20482
Modified Files:
release-notes.txt README.1st
Log Message:
Documented workaround for libdb3 conflict in README.1st (kolab/issue1607)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- release-notes.txt 20 Apr 2007 15:28:28 -0000 1.102
+++ release-notes.txt 24 Apr 2007 16:19:11 -0000 1.103
@@ -34,6 +34,11 @@
For details see kolab/issue1089.
+Changes since 2.1 rc 2:
+
+ Documented workaround for libdb3 conflict in README.1st
+
+
Changes since 2.1 rc 1:
- apache-1.3.33-2.5.6_kolab2
Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- README.1st 20 Apr 2007 10:24:31 -0000 1.54
+++ README.1st 24 Apr 2007 16:19:11 -0000 1.55
@@ -294,6 +294,33 @@
a UTF-8 locale, e.g. ja_JP.UTF-8 for Japanese.
See kolab/issue881 and kolab/issue1585 for details.
+ - If login on https://yourserver.example.com/fbview and triggering
+ free/busy regeneration does not work, try as user kolab:
+
+ /kolab/bin/php -r 'imap_open("{localhost:143/notls}", "" ,"");'
+
+ If it yields "Segmentation fault (core dumped)", then there probably is
+ a conflict between a dynamically loaded libdb3 from your system and a
+ statically linked libdb4 from the OpenpPKG php package. If it yields a
+ "PHP Warning: ...", this part of the system works correctly.
+
+ One reason for such a conflict could be the mere presence of
+ /lib/libnss_db.so.*, which is installed on some distributions by
+ default. On Debian systems it is contained in the package "libnss-db".
+ If you really need this library, you could work around the loading of
+ libdb3 by placing a symbolic link with the correct name in /kolab/lib,
+ e.g.:
+
+ ldd /lib/libnss_db.so.2
+ libnss_files.so.2 => /lib/tls/libnss_files.so.2 (0xb7f16000)
+ ---> libdb3.so.3 => /usr/lib/libdb3.so.3 (0xb7e6b000)
+ libc.so.6 => /lib/tls/libc.so.6 (0xb7d36000)
+ /lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0x80000000)
+ ln -s /dev/null /kolab/lib/libdb3.so.3
+
+ See kolab/issue1607 (need to replace gdbm for pfbcache, because of
+ license clash gdbm vs php) for details.
+
- Under some circumstance the Kolab server may not create or delete
users or update the configuration after changes have been made in
the web interface. This happens most often immediately after the
From cvs at kolab.org Wed Apr 25 19:48:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Apr 2007 19:48:17 +0200 (CEST)
Subject: bernhard: doc/proko2-doc doc3.sxw,1.35,1.36
Message-ID: <20070425174817.D6D531005A3@lists.intevation.de>
Author: bernhard
Update of /kolabrepository/doc/proko2-doc
In directory doto:/tmp/cvs-serv669
Modified Files:
doc3.sxw
Log Message:
Reworked the section about importing x509 certificates:
+ Made is a real section with an entry in the table of contents,
fixed the hyperlinks while doing so.
+ Expanded the section to explain that the full trust path
need to be imported
+ Expanded to explain that certificates from each server should be in.
+ Added hint that Kolab Server comes with a mini-ca, but many people
buy from providers.
Index: doc3.sxw
===================================================================
RCS file: /kolabrepository/doc/proko2-doc/doc3.sxw,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
Binary files /tmp/cvseKjmUa and /tmp/cvsMRQpU9 differ
From cvs at kolab.org Wed Apr 25 19:53:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Apr 2007 19:53:40 +0200 (CEST)
Subject: bernhard: doc/www/src documentation.html.m4,1.28,1.29
Message-ID: <20070425175340.7AE141005A3@lists.intevation.de>
Author: bernhard
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv828
Modified Files:
documentation.html.m4
Log Message:
Updated link to doc3 rev1.36 pdf is out.
Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- documentation.html.m4 27 Nov 2006 15:25:18 -0000 1.28
+++ documentation.html.m4 25 Apr 2007 17:53:38 -0000 1.29
@@ -20,8 +20,8 @@
>CVS HEAD as sxw
-
Outlook2003 with Toltec2 Setup (aka Doc3, pdf: 1,5MB, sxw: 0.5MB):
- Doc3, Version 1.34 as pdf
+ Outlook2003 with Toltec2 Setup (aka Doc3, pdf: 1.8MB, sxw: 0.5MB):
+ Doc3, Version 1.36 as pdf
|
CVS HEAD as sxw
From cvs at kolab.org Wed Apr 25 20:01:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Apr 2007 20:01:27 +0200 (CEST)
Subject: bernhard: doc/raw-howtos windows-zertifikate-imporieren.txt, NONE,
1.1
Message-ID: <20070425180127.0B51C1005A3@lists.intevation.de>
Author: bernhard
Update of /kolabrepository/doc/raw-howtos
In directory doto:/tmp/cvs-serv970
Added Files:
windows-zertifikate-imporieren.txt
Log Message:
Added long standing German raw-howto to explain the CA usage in Kolab Server.
--- NEW FILE: windows-zertifikate-imporieren.txt ---
(This appears to be a binary file; contents omitted.)
From cvs at kolab.org Thu Apr 26 17:15:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Apr 2007 17:15:38 +0200 (CEST)
Subject: thomas: server/amavisd .cvsignore, NONE, 1.1 Makefile, 1.1,
1.2 kolab.patch, 1.1, 1.2 amavisd.MYUSERS.patch, 1.1, NONE
Message-ID: <20070426151538.E4EE41005B3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/amavisd
In directory doto:/tmp/cvs-serv19460
Modified Files:
Makefile kolab.patch
Added Files:
.cvsignore
Removed Files:
amavisd.MYUSERS.patch
Log Message:
Create amavisd package containing the patch from kolab/issue1447
(Virus Scanning: Inserted note when partially scanned ugly.)
This was tested outside the packaged versions but forgotten to be included.
--- NEW FILE: .cvsignore ---
*.src.rpm
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/amavisd/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 6 Jan 2005 13:28:22 -0000 1.1
+++ Makefile 26 Apr 2007 15:15:36 -0000 1.2
@@ -1,27 +1,38 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/SRC/PLUS
+ KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC/PLUS/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
ifeq "x$(KOLABCVSDIR)" "x"
KOLABCVSDIR = $(CURDIR)
endif
PACKAGE=amavisd
-VERSION=2.1.2
-RELEASE=2.2.0
+VERSION=2.3.3
+RELEASE=2.5.0
+KOLABRELEASE=2.5.0_kolab
RPM=/kolab/bin/openpkg rpm
-
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
- $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
- cp $(KOLABCVSDIR)/amavisd.MYUSERS.patch $(KOLABRPMSRC)/$(PACKAGE)/
- cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for .spec
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm undecipherable_subject.patch kolab.patch
+ $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+ cp $(KOLABCVSDIR)/undecipherable_subject.patch $(KOLABRPMSRC)/$(PACKAGE)/
cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+dist: all
+ cp -p $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/amavisd/kolab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.patch 6 Jan 2005 13:28:22 -0000 1.1
+++ kolab.patch 26 Apr 2007 15:15:36 -0000 1.2
@@ -1,27 +1,28 @@
---- amavisd.spec.orig 2005-01-06 00:28:37.000000000 +0100
-+++ amavisd.spec 2005-01-06 00:42:17.000000000 +0100
-@@ -34,7 +34,7 @@ Class: PLUS
+diff -urN amavisd.orig/amavisd.spec amavisd/amavisd.spec
+--- amavisd.orig/amavisd.spec 2005-10-11 14:46:17.000000000 +0200
++++ amavisd/amavisd.spec 2007-04-26 17:03:02.666179000 +0200
+@@ -36,7 +36,7 @@
Group: Mail
License: GPL
- Version: 2.1.2
--Release: 2.2.0
-+Release: 2.2.0_kolab
+ Version: %{V_amavis}
+-Release: 2.5.0
++Release: 2.5.0_kolab
# package options
%option with_milter no
-@@ -43,6 +43,7 @@ Release: 2.2.0
- Source0: http://www.ijs.si/software/amavisd/amavisd-new-%{version}.tar.gz
- Source1: http://homepages.hs-bremen.de/~renegat/amavislogsumm
+@@ -46,6 +46,7 @@
+ Source1: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/amavisd/amavislogsumm-%{V_logsumm}
Source2: rc.amavisd
-+Patch0: amavisd.MYUSERS.patch
+ Patch0: amavisd.patch
++Patch1: undecipherable_subject.patch
# build information
Prefix: %{l_prefix}
-@@ -75,6 +76,7 @@ AutoReqProv: no
-
+@@ -84,6 +85,7 @@
%prep
%setup -q -n amavisd-new-%{version}
-+ %patch -p0 -P 0
+ %patch -p0
++ %patch -p0 -P 1
+
+ %build
%{l_shtool} subst \
- -e "s;'clamscan';'%{l_prefix}/bin/clamscan';g" \
- -e "s;'uvscan';'%{l_prefix}/bin/uvscan';g" \
--- amavisd.MYUSERS.patch DELETED ---
From cvs at kolab.org Thu Apr 26 17:17:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Apr 2007 17:17:44 +0200 (CEST)
Subject: thomas: server obmtool.conf, 1.252, 1.253 release-notes.txt, 1.103,
1.104
Message-ID: <20070426151744.E435E1005B3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv19566
Modified Files:
obmtool.conf release-notes.txt
Log Message:
Add amavisd package to obmtool.conf and release notes
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- obmtool.conf 20 Apr 2007 15:31:07 -0000 1.252
+++ obmtool.conf 26 Apr 2007 15:17:42 -0000 1.253
@@ -150,7 +150,7 @@
@install ${altloc}php-smarty-2.6.10-20051003
@install ${loc}gmp-4.1.4-2.5.0
@install ${altloc}spamassassin-3.1.0-2.5.1_kolab
- @install ${plusloc}amavisd-2.3.3-2.5.0
+ @install ${altloc}amavisd-2.3.3-2.5.0_kolab
@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
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- release-notes.txt 24 Apr 2007 16:19:11 -0000 1.103
+++ release-notes.txt 26 Apr 2007 15:17:42 -0000 1.104
@@ -38,6 +38,10 @@
Documented workaround for libdb3 conflict in README.1st
+ - amavisd-2.3.3-2.5.0_kolab
+
+ kolab/issue1447 (Virus Scanning: Inserted note when partially scanned ugly)
+
Changes since 2.1 rc 1:
From cvs at kolab.org Thu Apr 26 17:21:04 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Apr 2007 17:21:04 +0200 (CEST)
Subject: thomas: server Makefile,1.15,1.16
Message-ID: <20070426152104.B384A1005B5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv19662
Modified Files:
Makefile
Log Message:
forgot amavisd package in global Makefile
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile 17 Apr 2007 16:46:16 -0000 1.15
+++ Makefile 26 Apr 2007 15:21:02 -0000 1.16
@@ -4,6 +4,7 @@
cd file && make dist
cd spamassassin && make dist
cd clamav && make dist
+ cd amavisd && make dist
cd imap && make dist
cd apache && make dist
cd php && make dist
From cvs at kolab.org Thu Apr 26 18:20:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Apr 2007 18:20:33 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
kolabfilter.php.in, 1.13, 1.14
Message-ID: <20070426162033.721431005B3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv21028/kolab-resource-handlers/kolab-resource-handlers/resmgr
Modified Files:
kolabfilter.php.in
Log Message:
Fixed typo $param -> $params (kolab/issue974)
Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kolabfilter.php.in 28 Mar 2007 02:00:18 -0000 1.13
+++ kolabfilter.php.in 26 Apr 2007 16:20:31 -0000 1.14
@@ -170,13 +170,13 @@
global $params;
if( $sasluser ) {
if( array_key_exists('untrusted_subject_insert', $params) ) {
- $fmt = $param['untrusted_subject_insert'];
+ $fmt = $params['untrusted_subject_insert'];
} else {
$fmt = "(UNTRUSTED, sender is <%s>)";
}
} else {
if( array_key_exists('unauthenticated_subject_insert', $params) ) {
- $fmt = $param['unauthenticated_subject_insert'];
+ $fmt = $params['unauthenticated_subject_insert'];
} else {
$fmt = "(UNTRUSTED, sender <%s> is not authenticated)";
}
From cvs at kolab.org Thu Apr 26 18:22:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Apr 2007 18:22:25 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
resmgr.conf.in, 1.3, 1.4
Message-ID: <20070426162225.DD3941005B5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv21057/kolab-resource-handlers/kolab-resource-handlers/resmgr
Modified Files:
resmgr.conf.in
Log Message:
Added parameters for kolab/issue974 (from rewriting text) to config,
porting changes done to one or the other config in this process.
Index: resmgr.conf.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.conf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resmgr.conf.in 21 Dec 2006 10:59:22 -0000 1.3
+++ resmgr.conf.in 26 Apr 2007 16:22:23 -0000 1.4
@@ -38,6 +38,7 @@
// Text to be inserted in From: when rewriting untrusted mails
$params['untrusted_subject_insert']="(UNTRUSTED, sender is <%s>)";
+$params['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
// Should we allow forwarded ical messages from Outlook
// by encapsulating them in a MIME multipart
@@ -66,10 +67,12 @@
$params['priv_key_file'] = '@sysconfdir@/kolab/res_priv.pem';
// What is the name of the users' calendar mailbox?
+// This is only used when the user does not already have
+// a primary calendar folder (search via Kolab annotation)
$params['calendar_store'] = 'Calendar';
// Where can we get free/busy information from?
-$params['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.ifb';
+$params['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.xfb';
// PFB url to trigger creation of pfb
$params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
From cvs at kolab.org Thu Apr 26 18:22:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Apr 2007 18:22:25 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.104,1.105
Message-ID: <20070426162225.DDE821005B7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv21057
Modified Files:
release-notes.txt
Log Message:
Added parameters for kolab/issue974 (from rewriting text) to config,
porting changes done to one or the other config in this process.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- release-notes.txt 26 Apr 2007 15:17:42 -0000 1.104
+++ release-notes.txt 26 Apr 2007 16:22:23 -0000 1.105
@@ -42,6 +42,14 @@
kolab/issue1447 (Virus Scanning: Inserted note when partially scanned ugly)
+ - kolabd-2.1.0-2007????
+
+ kolab/issue974 (Localize the text for rewritten From: headers)
+
+ - kolab-resource-handlers-2.1.0-2007????
+
+ kolab/issue974 (Localize the text for rewritten From: headers)
+
Changes since 2.1 rc 1:
From cvs at kolab.org Thu Apr 26 18:22:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Apr 2007 18:22:25 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.7,
1.8
Message-ID: <20070426162225.DF6901005BA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv21057/kolabd/kolabd/templates
Modified Files:
resmgr.conf.template.in
Log Message:
Added parameters for kolab/issue974 (from rewriting text) to config,
porting changes done to one or the other config in this process.
Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- resmgr.conf.template.in 22 Mar 2007 11:51:42 -0000 1.7
+++ resmgr.conf.template.in 26 Apr 2007 16:22:23 -0000 1.8
@@ -33,6 +33,10 @@
$params['verify_from_header'] = false;
@@@endif@@@
+// Should we perform this check on mail from our
+// subdomains too?
+$params['verify_subdomains'] = false;
+
// Should the Sender: header be used over From: if present?
@@@if kolabfilter-allow-sender-header@@@
$params['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
@@ -48,13 +52,13 @@
$params['reject_forged_from_header'] = false;
@@@endif@@@
+// Text to be inserted in From: when rewriting untrusted mails
+$params['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
+$params['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
+
// Should we allow forwarded ical messages from Outlook
// by encapsulating them in a MIME multipart
$params['allow_outlook_ical_forward'] = true;
-
-// Should we perform this check on mail from our
-// subdomains too?
-$params['verify_subdomains'] = true;
// LDAP data
// What is the address of the LDAP server address where user objects reside
From cvs at kolab.org Thu Apr 26 18:30:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Apr 2007 18:30:00 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
kolabfilter.php, 1.26.2.10, 1.26.2.11
Message-ID: <20070426163000.954A81005B5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv21309/kolab-resource-handlers/kolab-resource-handlers/resmgr
Modified Files:
Tag: kolab_2_0_branch
kolabfilter.php
Log Message:
Fixed/documented kolab/issue974 (Localize the text for rewritten from: headers)
Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.10
retrieving revision 1.26.2.11
diff -u -d -r1.26.2.10 -r1.26.2.11
--- kolabfilter.php 19 Oct 2006 20:19:05 -0000 1.26.2.10
+++ kolabfilter.php 26 Apr 2007 16:29:58 -0000 1.26.2.11
@@ -107,7 +107,7 @@
{
global $params;
if( array_key_exists('untrusted_subject_insert', $params) ) {
- return $param['untrusted_subject_insert'];
+ return $params['untrusted_subject_insert'];
} else {
return "(UNTRUSTED, sender is <%s>)";
}
From cvs at kolab.org Thu Apr 26 18:30:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Apr 2007 18:30:00 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.15.2.21,1.15.2.22
Message-ID: <20070426163000.7F5AF1005B5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv21309
Modified Files:
Tag: kolab_2_0_branch
release-notes.txt
Log Message:
Fixed/documented kolab/issue974 (Localize the text for rewritten from: headers)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.15.2.21
retrieving revision 1.15.2.22
diff -u -d -r1.15.2.21 -r1.15.2.22
--- release-notes.txt 7 Dec 2006 11:59:00 -0000 1.15.2.21
+++ release-notes.txt 26 Apr 2007 16:29:58 -0000 1.15.2.22
@@ -1,5 +1,5 @@
Release notes Kolab2 Server
-(Version 2006????, Kolab Server 2.0.4+CVS)
+(Version 2007????, Kolab Server 2.0.4+CVS)
For upgrading and installation instructions, please refer to the
1st.README file in the source directory.
@@ -10,7 +10,7 @@
Added package to make DNS blacklists work within SpamAssassin.
- - kolabd-1.9.4-2006????
+ - kolabd-1.9.4-2007????
Changed main.cf email masquerading defaults so that email to
user at machine.example.org that reaches the server machine is
@@ -18,6 +18,12 @@
Updated proftpd.conf template: LDAPHomedirOnDemand(Prefix) is
now named LDAPGenerateHomedir(Prefix).
+
+ kolab/issue974 (Localize the text for rewritten From: headers)
+
+ - kolab-resource-handlers-0.3.9-2007????
+
+ kolab/issue974 (Localize the text for rewritten From: headers)
Changes since 2.0.3:
From cvs at kolab.org Thu Apr 26 18:30:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Apr 2007 18:30:00 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates resmgr.conf.template, 1.7,
1.7.2.1
Message-ID: <20070426163000.998FD1005B7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv21309/kolabd/kolabd/templates
Modified Files:
Tag: kolab_2_0_branch
resmgr.conf.template
Log Message:
Fixed/documented kolab/issue974 (Localize the text for rewritten from: headers)
Index: resmgr.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/resmgr.conf.template,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- resmgr.conf.template 17 Jun 2005 14:40:28 -0000 1.7
+++ resmgr.conf.template 26 Apr 2007 16:29:58 -0000 1.7.2.1
@@ -28,6 +28,9 @@
// the envelope? Default is to rewrite the header
$params['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
+// Text to be inserted in From: when rewriting untrusted mails
+$params['untrusted_subject_insert']="(UNTRUSTED, sender is <%s>)";
+
// Should we allow forwarded ical messages from Outlook
// by encapsulating them in a MIME multipart
$params['allow_outlook_ical_forward'] = true;
From cvs at kolab.org Sun Apr 29 20:44:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 29 Apr 2007 20:44:47 +0200 (CEST)
Subject: marcus: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
freebusyimapcache.class.php, 1.3, 1.4
Message-ID: <20070429184447.902361006AB@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv5066/freebusy
Modified Files:
freebusyimapcache.class.php
Log Message:
Fixed indention. Now it fits better to the other freebusy classes. (sorry for this commit but IMHO it's easier to read the freebusy-code if we have one coding style)
Index: freebusyimapcache.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyimapcache.class.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freebusyimapcache.class.php 22 Nov 2006 15:22:40 -0000 1.3
+++ freebusyimapcache.class.php 29 Apr 2007 18:44:45 -0000 1.4
@@ -86,130 +86,130 @@
if (!$changed)
myLog("check_changed: folder didn't change", RM_LOG_DEBUG);
- return $changed;
- }
+ return $changed;
+ }
- function check_uid_exists($uid) {
- return array_key_exists($uid, $this->cache["imap2fb"]);
- }
+ function check_uid_exists($uid) {
+ return array_key_exists($uid, $this->cache["imap2fb"]);
+ }
- function add_empty_imap2fb(&$imap_uid) {
- $this->cache["imap2fb"][$imap_uid] = array();
- $this->cache_modified = true;
- }
+ function add_empty_imap2fb(&$imap_uid) {
+ $this->cache["imap2fb"][$imap_uid] = array();
+ $this->cache_modified = true;
+ }
- function add_imap2fb(&$imap_uid, $fb_start, $fb_end, $fb_duration, $fb_extra) {
- /*
- Internal imap2fb array structure:
- 0..n IMAP uid
- |----------- 0..n free/busy periods
- |----------- start
- |----------- end
- |----------- duration
- |----------- extra
- */
- myLog("added event to store: uid: $imap_uid, start: $fb_start, end: $fb_end, duration: $fb_duration", RM_LOG_DEBUG);
+ function add_imap2fb(&$imap_uid, $fb_start, $fb_end, $fb_duration, $fb_extra) {
+ /*
+ Internal imap2fb array structure:
+ 0..n IMAP uid
+ |----------- 0..n free/busy periods
+ |----------- start
+ |----------- end
+ |----------- duration
+ |----------- extra
+ */
+ myLog("added event to store: uid: $imap_uid, start: $fb_start, end: $fb_end, duration: $fb_duration", RM_LOG_DEBUG);
- $store = array();
- $store["start"] = $fb_start;
- $store["end"] = $fb_end;
- $store["duration"] = $fb_duration;
- $store["extra"] = $fb_extra;
+ $store = array();
+ $store["start"] = $fb_start;
+ $store["end"] = $fb_end;
+ $store["duration"] = $fb_duration;
+ $store["extra"] = $fb_extra;
- $this->cache["imap2fb"][$imap_uid][] = $store;
- $this->cache_modified = true;
- }
+ $this->cache["imap2fb"][$imap_uid][] = $store;
+ $this->cache_modified = true;
+ }
- function output_fb(&$vFb) {
- reset($this->cache["imap2fb"]);
- while(list($uid, $periods) = each($this->cache["imap2fb"]))
- while(list($key, $period) = each($periods))
- $vFb->addBusyPeriod('BUSY', $period["start"], $period["end"], $period["duration"], $period["extra"]);
- }
+ function output_fb(&$vFb) {
+ reset($this->cache["imap2fb"]);
+ while(list($uid, $periods) = each($this->cache["imap2fb"]))
+ while(list($key, $period) = each($periods))
+ $vFb->addBusyPeriod('BUSY', $period["start"], $period["end"], $period["duration"], $period["extra"]);
+ }
- function compute_filename() {
- $folder_parts = explode('/', $this->foldername);
- unset($folder_parts[0]);
- $folder_storename = join('/', $folder_parts);
-
- $folder_storename = str_replace(".", "^", $folder_storename);
- $folder_storename = str_replace("\0", "", $folder_storename);
+ function compute_filename() {
+ $folder_parts = explode('/', $this->foldername);
+ unset($folder_parts[0]);
+ $folder_storename = join('/', $folder_parts);
- if( ereg( '(.*)@(.*)', $this->owner, $regs ) ) {
- $domain = $regs[2].'/';
- $domain = str_replace(".", "^", $domain);
- $domain = str_replace("\0", "", $domain);
- } else $domain = '';
+ $folder_storename = str_replace(".", "^", $folder_storename);
+ $folder_storename = str_replace("\0", "", $folder_storename);
+
+ if( ereg( '(.*)@(.*)', $this->owner, $regs ) ) {
+ $domain = $regs[2].'/';
+ $domain = str_replace(".", "^", $domain);
+ $domain = str_replace("\0", "", $domain);
+ } else $domain = '';
- $full_path = $this->store_prefix.$domain.$folder_storename.".imapcache";
- return $full_path;
- }
+ $full_path = $this->store_prefix.$domain.$folder_storename.".imapcache";
+ return $full_path;
+ }
- function cache_load() {
- $filename = $this->compute_filename();
+ function cache_load() {
+ $filename = $this->compute_filename();
- myLog("Trying to load file: $filename", RM_LOG_DEBUG);
+ myLog("Trying to load file: $filename", RM_LOG_DEBUG);
- if (!is_readable($filename))
- return false;
+ if (!is_readable($filename))
+ return false;
- $this->cache = unserialize(file_get_contents($filename));
+ $this->cache = unserialize(file_get_contents($filename));
- // Delete disc cache if it's from an old version
- if ($this->cache["version"] != $this->version) {
- myLog("Version mismatch (got: ".$this->cache["version"].", current: ".$this->version.", dropping cache", RM_LOG_WARN);
- $this->reset_cache();
- }
- else $this->cache_modified = false;
- return true;
- }
+ // Delete disc cache if it's from an old version
+ if ($this->cache["version"] != $this->version) {
+ myLog("Version mismatch (got: ".$this->cache["version"].", current: ".$this->version.", dropping cache", RM_LOG_WARN);
+ $this->reset_cache();
+ }
+ else $this->cache_modified = false;
+ return true;
+ }
- function cache_store($force=false) {
- if ($this->cache_modified || $force) {
- $filename = $this->compute_filename();
- myLog("Trying to save cache to file: $filename", RM_LOG_DEBUG);
+ function cache_store($force=false) {
+ if ($this->cache_modified || $force) {
+ $filename = $this->compute_filename();
+ myLog("Trying to save cache to file: $filename", RM_LOG_DEBUG);
- if (!$this->mkdirhier(dirname($filename))) {
- myLog("can't create director hierachy: ".dirname($filename), RM_LOG_ERROR);
+ if (!$this->mkdirhier(dirname($filename))) {
+ myLog("can't create director hierachy: ".dirname($filename), RM_LOG_ERROR);
+ return;
+ }
+
+ $tmpname = tempnam(dirname($this->store_prefix), 'imapcache');
+ $fp = fopen($tmpname, 'w');
+ if(!$fp) return false;
+ if (fwrite($fp, serialize($this->cache)) === false) {
+ fclose ($fp);
+ myLog("can't write to file: $tmpname. Out of discspace?", RM_LOG_ERROR);
return;
}
- $tmpname = tempnam(dirname($this->store_prefix), 'imapcache');
- $fp = fopen($tmpname, 'w');
- if(!$fp) return false;
- if (fwrite($fp, serialize($this->cache)) === false) {
- fclose ($fp);
- myLog("can't write to file: $tmpname. Out of discspace?", RM_LOG_ERROR);
- return;
- }
-
- if(!rename($tmpname, $filename)) {
- myLog("can't rename $tmpname to $filename", RM_LOG_ERROR);
- return false;
- }
- fclose($fp);
- $this->cache_modified = false;
- }
- else {
- myLog("IMAPcache unmodified, not saving", RM_LOG_DEBUG);
- }
- }
+ if(!rename($tmpname, $filename)) {
+ myLog("can't rename $tmpname to $filename", RM_LOG_ERROR);
+ return false;
+ }
+ fclose($fp);
+ $this->cache_modified = false;
+ }
+ else {
+ myLog("IMAPcache unmodified, not saving", RM_LOG_DEBUG);
+ }
+ }
- function cache_delete() {
- unlink($this->compute_filename());
- $this->reset_cache();
- }
+ function cache_delete() {
+ unlink($this->compute_filename());
+ $this->reset_cache();
+ }
- function mkdirhier( $dirname ) {
- $base = substr($dirname,0,strrpos($dirname,'/'));
- $base = str_replace(".", "^", $base);
- if( !empty( $base ) && !is_dir( $base ) ) {
- if( !$this->mkdirhier( $base ) ) return false;
- }
- if( !file_exists( $dirname ) ) return mkdir( $dirname, 0755 );
- return true;
+ function mkdirhier( $dirname ) {
+ $base = substr($dirname,0,strrpos($dirname,'/'));
+ $base = str_replace(".", "^", $base);
+ if( !empty( $base ) && !is_dir( $base ) ) {
+ if( !$this->mkdirhier( $base ) ) return false;
}
+ if( !file_exists( $dirname ) ) return mkdir( $dirname, 0755 );
+ return true;
+ }
};
-?>
\ No newline at end of file
+?>
From cvs at kolab.org Sun Apr 29 20:44:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 29 Apr 2007 20:44:47 +0200 (CEST)
Subject: marcus: server/kolab-resource-handlers/kolab-resource-handlers
ChangeLog, 1.31, 1.32
Message-ID: <20070429184447.8E7961006AA@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers
In directory doto:/tmp/cvs-serv5066
Modified Files:
ChangeLog
Log Message:
Fixed indention. Now it fits better to the other freebusy classes. (sorry for this commit but IMHO it's easier to read the freebusy-code if we have one coding style)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog 20 Mar 2007 16:20:55 -0000 1.31
+++ ChangeLog 29 Apr 2007 18:44:45 -0000 1.32
@@ -1,3 +1,8 @@
+2007-04-29 Marcus Hüwe
+
+ * freebusy/freebusyimapcache.class.php: Fixed indention. Now it
+ fits better to the other freebusy classes.
+
2007-03-20 Thomas Arendsen Hein
* freebusy/freebusy.class.php.in: Don't assume that all day events
From cvs at kolab.org Tue May 1 10:16:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 1 May 2007 10:16:57 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.8,
1.9
Message-ID: <20070501081657.118851006B7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv8215
Modified Files:
resmgr.conf.template.in
Log Message:
Reverted verify_subdomains parameter to previous/correct setting (true).
Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- resmgr.conf.template.in 26 Apr 2007 16:22:23 -0000 1.8
+++ resmgr.conf.template.in 1 May 2007 08:16:54 -0000 1.9
@@ -35,7 +35,7 @@
// Should we perform this check on mail from our
// subdomains too?
-$params['verify_subdomains'] = false;
+$params['verify_subdomains'] = true;
// Should the Sender: header be used over From: if present?
@@@if kolabfilter-allow-sender-header@@@
From cvs at kolab.org Wed May 2 15:29:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 2 May 2007 15:29:27 +0200 (CEST)
Subject: schreiber: doc/www/src index.html.m4, 1.115, 1.116 newsarchive.html.m4,
1.14, 1.15
Message-ID: <20070502132927.A90231006CC@lists.intevation.de>
Author: schreiber
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv860
Modified Files:
index.html.m4 newsarchive.html.m4
Log Message:
solved conflict
Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- index.html.m4 20 Apr 2007 17:36:26 -0000 1.115
+++ index.html.m4 2 May 2007 13:29:25 -0000 1.116
@@ -81,6 +81,14 @@
+
+
+
+
+
+
+
+
March 15th - 21st, 2007
»
@@ -101,9 +109,7 @@
Univention will also give a talk about "Migration to a free Groupware Server - Microsoft Exchange to Kolab2" as part of the IX Forum Software & Systems discussion.
CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm (in German)
-
-
-
+
February 12th 2007
@@ -118,10 +124,8 @@
-
-
February 5th, 2007
@@ -137,8 +141,6 @@
announcement for details.
-
-
January 17th, 2007
»
@@ -151,90 +153,6 @@
announcement for details.
-
-
-
-December 19th, 2006
-»
- Security Advisory 14 for Kolab Server (ClamAV)
-
-
-
- Two remotely exploitable vulnerabilities were found in the Clam AntiVirus package.
- A new ClamAV RPM with a fix is available. See the
-
Kolab Security
- Issue 14 for details.
-
-
-
-
-November 16th, 2006
-»
- Kolab Server 2.1 Beta 3 released
-
-
-
- This release fixes more than 30 problems found in Beta 2 and
- includes the security updates published until now. See
- the
release
- notes for more details and information on upgrading from Kolab
- Server 2.0 to 2.1.
-
-
-
-
-November 14th - 16th, 2006
-»
- Presentation of Kolab-based UGS at LinuxWorld Expo 2006 in Cologne, Germany
-
-
-
-
Univention ,
- business partner of
Kolab-Konsortium ,
- presents the Kolab-based Univention Groupware Server
- (UGS).
- (Special exhibition Linux/OS in the office, hall 11.2)
-
-
-
-
-November 2nd, 2006
-»
- New KDE Kolab Client released, revision 'proko2 2.1.5'.
-
-
-
- This release contains several fixes and
- a few new features, like:
-
-
-
- Ability to add ones signature at top of
- an email reply automatically
- or manually at the cursor position.
-
- An extra button to send an email to results
- of LDAP queries and the possibility to reach that query
- dialog directly from the address selection dialog.
-
- The release notes contain the full list.
-
-
-
-
-October 23th - 27th, 2006
-»
- Kolab-based UGS at Systems 2006 in Munich, Germany
-
-
-
-
Univention ,
- business partner of
Kolab-Konsortium ,
- shows the Kolab-based Univention Groupware Server (UGS).
- (hall 3 - booth A3.441-12)
-
-
Index: newsarchive.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/newsarchive.html.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- newsarchive.html.m4 17 Apr 2007 09:32:08 -0000 1.14
+++ newsarchive.html.m4 2 May 2007 13:29:25 -0000 1.15
@@ -16,6 +16,89 @@
+December 19th, 2006
+»
+ Security Advisory 14 for Kolab Server (ClamAV)
+
+
+
+ Two remotely exploitable vulnerabilities were found in the Clam AntiVirus package.
+ A new ClamAV RPM with a fix is available. See the
+
Kolab Security
+ Issue 14 for details.
+
+
+
+
+November 16th, 2006
+»
+ Kolab Server 2.1 Beta 3 released
+
+
+
+ This release fixes more than 30 problems found in Beta 2 and
+ includes the security updates published until now. See
+ the
release
+ notes for more details and information on upgrading from Kolab
+ Server 2.0 to 2.1.
+
+
+
+
+November 14th - 16th, 2006
+»
+ Presentation of Kolab-based UGS at LinuxWorld Expo 2006 in Cologne, Germany
+
+
+
+
Univention ,
+ business partner of
Kolab-Konsortium ,
+ presents the Kolab-based Univention Groupware Server
+ (UGS).
+ (Special exhibition Linux/OS in the office, hall 11.2)
+
+
+
+
+November 2nd, 2006
+»
+ New KDE Kolab Client released, revision 'proko2 2.1.5'.
+
+
+
+ This release contains several fixes and
+ a few new features, like:
+
+
+
+ Ability to add ones signature at top of
+ an email reply automatically
+ or manually at the cursor position.
+
+ An extra button to send an email to results
+ of LDAP queries and the possibility to reach that query
+ dialog directly from the address selection dialog.
+
+ The release notes contain the full list.
+
+
+
+
+October 23th - 27th, 2006
+»
+ Kolab-based UGS at Systems 2006 in Munich, Germany
+
+
+
+
Univention ,
+ business partner of
Kolab-Konsortium ,
+ shows the Kolab-based Univention Groupware Server (UGS).
+ (hall 3 - booth A3.441-12)
+
+
+
+
October 19th, 2006
»
Security Advisory 13 for Kolab Server (ClamAV)
From cvs at kolab.org Wed May 2 15:48:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 2 May 2007 15:48:56 +0200 (CEST)
Subject: thomas: server README.1st,1.55,1.56
Message-ID: <20070502134856.7D3FE1006CC@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1284
Modified Files:
README.1st
Log Message:
Mention wiki and announcement list, improve install docs
install docs improvements:
- use "sh obmtool" to not depend on executable bit
- always use tee with obmtool
- show how to check integrity of package files
- mention that /kolab will be created if necessary
Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- README.1st 24 Apr 2007 16:19:11 -0000 1.55
+++ README.1st 2 May 2007 13:48:54 -0000 1.56
@@ -1,7 +1,12 @@
Kolab2 Server Install and Upgrade Information
=============================================
-For more information about Kolab, see http://kolab.org/
+See http://kolab.org/ for general information about Kolab,
+or look at http://wiki.kolab.org/ for specific topics.
+
+It is recommended to subscribe to the announcement mailing list at
+http://kolab.org/mailman/listinfo/kolab-announce
+to receive security advisories and release announcements.
Quick install instructions
@@ -9,6 +14,7 @@
For a fresh install /kolab needs to be an empty directory with at least 1GB of
free disk space. You can use a symlink, but do _not_ use an NFS mounted drive.
+If the directory does not yet exist, it will automatically be created.
Make sure that the following names are not in /etc/passwd or /etc/groups,
as openpkg will want to create them: "kolab" "kolab-r" "kolab-n"
@@ -16,10 +22,16 @@
for the OpenPKG packaging system.
To install the Kolab2 server, you need to download the files from the
-directory containing this file (1st.README) to some local directory,
-then as root, chdir into that local directory and run
+directory containing this file (1st.README) to some local directory.
-# ./obmtool kolab 2>&1 | tee kolab-build.log
+You can check the integrity of the downloaded files with:
+
+$ gpg --verify MD5SUMS
+$ md5sum -c MD5SUMS
+
+Then as root, cd into that local directory and run
+
+# sh obmtool kolab 2>&1 | tee kolab-build.log
to build and install packages in /kolab.
By default, the Kolab Server will now be started at boottime.
@@ -47,7 +59,7 @@
The installation of the new packages works just as for the initial
installation. Download the files as described above and run
-# ./obmtool kolab
+# sh obmtool kolab 2>&1 | tee kolab-update.log
obmtool will usually automatically determine which packages need to be
built. If you have made changes to configuration files or an updated
From cvs at kolab.org Wed May 2 18:04:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 2 May 2007 18:04:27 +0200 (CEST)
Subject: thomas: utils/admin convert-gdbm-dbload,NONE,1.1
Message-ID: <20070502160427.44257101EE2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv4596
Added Files:
convert-gdbm-dbload
Log Message:
Python script to convert pfbcache.db after gdbm->db4 migration.
--- NEW FILE: convert-gdbm-dbload ---
#!/usr/bin/env python
# $Id: convert-gdbm-dbload,v 1.1 2007/05/02 16:04:25 thomas Exp $
#
# Copyright (C) 2007 by Intevation GmbH
# Author(s):
# Thomas Arendsen Hein
#
# This program is free software under the GNU GPL (>=v2)
"""convert-gdbm-dbload
Usage:
convert-gdbm-dbload pfbcache.db-gdbm | db_load pfbcache.db-db4
Read gdbm database and dump in a format suitable for db_load.
db_load is part of Berkeley DB.
Requires python (tested with version 2.3) and the python-gdbm module.
"""
__version__ = "$Revision: 1.1 $"
import sys
import binascii
import gdbm
def error(msg):
sys.stderr.write('%s\n' % (msg,))
sys.exit(1)
def main(gdbmfile):
"""Read gdbm database and dump in a format suitable for db_load."""
try:
db = gdbm.open(gdbmfile)
except gdbm.error, inst:
if len(inst.args) == 2:
error('Error opening %s: %s' % (gdbmfile, inst[1]))
else:
error('Error opening %s: %s' % (gdbmfile, inst))
sys.stdout.write(
"VERSION=3\n"
"format=bytevalue\n"
"type=btree\n"
"db_pagesize=4096\n"
"HEADER=END\n"
)
k = db.firstkey()
while k != None:
sys.stdout.write(" %s\n %s\n"
% (binascii.hexlify(k), binascii.hexlify(db[k])))
k = db.nextkey(k)
db.close()
sys.stdout.write("DATA=END\n")
if __name__ == "__main__":
if len(sys.argv) != 2:
error('Usage: %s pfbcache.db-gdbm | db_load pfbcache.db-db4'
% sys.argv[0])
else:
main(sys.argv[1])
From cvs at kolab.org Thu May 3 01:43:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 3 May 2007 01:43:22 +0200 (CEST)
Subject: martin: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
freebusy.class.php.in, 1.11, 1.12
Message-ID: <20070502234322.77C40101EFC@lists.intevation.de>
Author: martin
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv22409
Modified Files:
freebusy.class.php.in
Log Message:
Martin Konold: removed bogus DTSTART and DTEND for empty calendar folders.
see also: https://intevation.de/roundup/kolab/issue1422 (Thanks to Pieter!)
Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- freebusy.class.php.in 20 Mar 2007 16:20:55 -0000 1.11
+++ freebusy.class.php.in 2 May 2007 23:43:20 -0000 1.12
@@ -23,8 +23,10 @@
/*
TODO: Looks like we don't get called for deleted folders.
- Best thing would be to have a cron script which deletes
- unmodified pfbs/caches after 2 months.
+ Best thing would be to make the clients make the call.
+ As an alternative a update_pfbs(user) script which can be
+ called regularily for all users also helps with incompatible
+ updates.
*/
@@ -165,8 +167,10 @@
$status = imap_status_current($this->imap, SA_MESSAGES | SA_UIDVALIDITY | SA_UIDNEXT);
if( $status->messages == 0 ) {
- $vFb->setAttribute('DTSTART', 0, array(), false );
- $vFb->setAttribute('DTEND', 0, array(), false );
+ //Outlook does not like the fake DTSTART and DTEND information
+ //see also: https://intevation.de/roundup/kolab/issue1422
+ //$vFb->setAttribute('DTSTART', 0, array(), false );
+ //$vFb->setAttribute('DTEND', 0, array(), false );
$vFb->setAttribute('COMMENT', 'This is a dummy vfreebusy that indicates an empty calendar');
/* It seems to be a bad idea to put bogus values in pfbs
* so we accept that they are not completely in line
From cvs at kolab.org Thu May 3 01:59:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 3 May 2007 01:59:16 +0200 (CEST)
Subject: martin: doc/www/src print.css,NONE,1.1 header.html.m4,1.6,1.7
Message-ID: <20070502235916.63900101EF3@lists.intevation.de>
Author: martin
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv22716
Modified Files:
header.html.m4
Added Files:
print.css
Log Message:
Martin Konold: Add support for printing style sheet as provided by Tim Gerundt
--- NEW FILE: print.css ---
body, td {
font: 12px Verdana, Arial, Helvetica, sans-serif;
}
img {
border: 0;
}
.hint {
font-style: italic;
}
.note {
border: 1px dashed black;
padding: 0.5em;
margin: 0.5em;
}
/* Menu container */
#menu {
display: none;
}
/* Menu box header */
.mbh {
display: none;
}
/* Menu box body */
.mbox {
display: none;
}
/* Content box header */
.cbh {
border-bottom: 2px solid black;
padding-top: 5px;
}
.cbhtext {
font-size: 150%;
/*font-weight: bold;*/
padding-left: 1em;
vertical-align: middle;
}
/* Footer block */
#footer {
margin-top: 1em;
border-bottom: 2px solid black;
border-top: 2px solid black;
font-size: 75%;
text-align: center;
}
/* Last-updated timestamp tag */
#date {
text-align: right;
font-size: 85%;
font-family: monospace;
padding-right: 0.5em;
padding-left: 0.5em;
margin: 0.5em;
}
/* Shell/source code */
.shell {
border: 1px solid black;
padding: 0.5em;
margin: 0.5em;
}
/* News date */
.newsd {
font-size: 110%;
font-weight: bold;
white-space: nowrap;
width: 200px;
}
/* News header */
.newsh {
font-size: 110%;
font-weight: bold;
}
/* News body */
.newsb {
padding-left: 3em;
}
.news .newsb {
margin-bottom: 2em;
}
Index: header.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/header.html.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- header.html.m4 3 Nov 2006 11:13:24 -0000 1.6
+++ header.html.m4 2 May 2007 23:59:14 -0000 1.7
@@ -15,6 +15,7 @@
+
From cvs at kolab.org Thu May 3 02:33:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 3 May 2007 02:33:46 +0200 (CEST)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin style.css, 1.9,
1.10
Message-ID: <20070503003346.CA5C7101EF8@lists.intevation.de>
Author: martin
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin
In directory doto:/tmp/cvs-serv24108
Modified Files:
style.css
Log Message:
Martin Konold: Add support for pointer cursors when using labels. (will be usefull later but does not hurt)
Kudos to Tim Gerundt!
Index: style.css
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/style.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- style.css 8 Dec 2006 22:02:35 -0000 1.9
+++ style.css 3 May 2007 00:33:44 -0000 1.10
@@ -194,3 +194,7 @@
font-size: 80%;
text-align: right;
}
+
+label {
+ cursor: pointer;
+}
From cvs at kolab.org Thu May 3 16:12:39 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 3 May 2007 16:12:39 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.105,1.106
Message-ID: <20070503141239.4639D1005B3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv10492
Modified Files:
release-notes.txt
Log Message:
Updated release notes, use "between foo and bar" instead of "since foo".
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- release-notes.txt 26 Apr 2007 16:22:23 -0000 1.105
+++ release-notes.txt 3 May 2007 14:12:37 -0000 1.106
@@ -1,11 +1,11 @@
Release notes Kolab2 Server
-(Version 20070420, Kolab Server 2.1 rc 2)
+(Version 2007????, Kolab Server 2.1.0)
This is a development snapshot of the kolab server leading up to a 2.1
release. For upgrading and installation instructions, please refer to
the 1st.README file in the source directory.
-These topics need testing in 2.1 rc 2:
+These topics need testing in 2.1-rc-???:
- Upgrades from Kolab server 2.0, see 1st.README and UPGRADING.20-21.
- New free/busy code
@@ -34,7 +34,7 @@
For details see kolab/issue1089.
-Changes since 2.1 rc 2:
+Changes between 2.1-rc-2 and 2.1.0:
Documented workaround for libdb3 conflict in README.1st
@@ -49,9 +49,14 @@
- kolab-resource-handlers-2.1.0-2007????
kolab/issue974 (Localize the text for rewritten From: headers)
+ kolab/issue1422 (Dummy freebusy info)
+ - kolab-webadmin-2.1.0-2007????
+
+ kolab/issue1616 (Use different cursor for tags)
-Changes since 2.1 rc 1:
+
+Changes between 2.1-rc-1 and 2.1-rc-2:
- apache-1.3.33-2.5.6_kolab2
@@ -137,7 +142,7 @@
kolab/issue1670 (Renaming a domain maintainer twice within the same form fails)
-Changes since 2.1 beta 4:
+Changes between 2.1-beta-4 and 2.1-rc-1:
- kolabd-2.0.99-20070205
@@ -160,7 +165,7 @@
kolab/issue1592 (LANGUAGE variable overrides web admin language selection)
-Changes since 2.1 beta 3:
+Changes between 2.1-beta-3 and 2.1-beta-4:
- clamav-0.88.7-20061211
@@ -212,7 +217,7 @@
kolab/issue1550 (Masquerade problem)
-Changes since 2.1 beta 2:
+Changes between 2.1-beta-2 and 2.1-beta-3:
- openpkg-2.5.4-2.5.4
@@ -318,7 +323,7 @@
kolab/issue1422 (Dummy freebusy info)
-Changes since 2.1 beta 1:
+Changes between 2.1-beta-1 and 2.1-beta-2:
OpenPKG updates:
From cvs at kolab.org Mon May 7 13:17:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 7 May 2007 13:17:00 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers
ChangeLog, 1.32, 1.33
Message-ID: <20070507111700.4F4EB1005B7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers
In directory doto:/tmp/cvs-serv30665/kolab-resource-handlers/kolab-resource-handlers
Modified Files:
ChangeLog
Log Message:
Generate a single To: header listing all recipients when forwarding encapsulated iCal messages.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ChangeLog 29 Apr 2007 18:44:45 -0000 1.32
+++ ChangeLog 7 May 2007 11:16:58 -0000 1.33
@@ -1,3 +1,8 @@
+2007-05-07 Thomas Arendsen Hein
+
+ * resmgr/olhacks.php.in: Generate a single To: header listing all
+ recipients when forwarding encapsulated iCal messages.
+
2007-04-29 Marcus Hüwe
* freebusy/freebusyimapcache.class.php: Fixed indention. Now it
From cvs at kolab.org Mon May 7 13:17:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 7 May 2007 13:17:00 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.106,1.107
Message-ID: <20070507111700.46D5E1005A3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv30665
Modified Files:
release-notes.txt
Log Message:
Generate a single To: header listing all recipients when forwarding encapsulated iCal messages.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- release-notes.txt 3 May 2007 14:12:37 -0000 1.106
+++ release-notes.txt 7 May 2007 11:16:58 -0000 1.107
@@ -48,6 +48,9 @@
- kolab-resource-handlers-2.1.0-2007????
+ Generate a single To: header listing all recipients when forwarding
+ encapsulated iCal messages.
+
kolab/issue974 (Localize the text for rewritten From: headers)
kolab/issue1422 (Dummy freebusy info)
From cvs at kolab.org Mon May 7 13:17:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 7 May 2007 13:17:00 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
olhacks.php.in, 1.4, 1.5
Message-ID: <20070507111700.510C11005D4@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv30665/kolab-resource-handlers/kolab-resource-handlers/resmgr
Modified Files:
olhacks.php.in
Log Message:
Generate a single To: header listing all recipients when forwarding encapsulated iCal messages.
Index: olhacks.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- olhacks.php.in 13 Apr 2006 14:17:54 -0000 1.4
+++ olhacks.php.in 7 May 2007 11:16:58 -0000 1.5
@@ -173,9 +173,7 @@
copy_header( 'Resent-Date', $msg_headers, $headers );
copy_header( 'Subject', $msg_headers, $headers );
$msg_headers->addHeader('From', $sender);
- foreach( $recipients as $recip ) {
- $msg_headers->addHeader('To', $recip);
- }
+ $msg_headers->addHeader('To', join(', ', $recipients));
$msg_headers->addHeader('X-Kolab-Forwarded', 'TRUE');
$msg_headers->addMIMEHeaders($toppart);
copy_header( 'Content-Transfer-Encoding', $msg_headers, $headers );
From cvs at kolab.org Mon May 7 13:19:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 7 May 2007 13:19:38 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
olhacks.php, 1.7.2.1, 1.7.2.2
Message-ID: <20070507111938.6C9F31005B7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv30769/kolab-resource-handlers/kolab-resource-handlers/resmgr
Modified Files:
Tag: kolab_2_0_branch
olhacks.php
Log Message:
Generate a single To: header listing all recipients when forwarding encapsulated iCal messages.
Index: olhacks.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/olhacks.php,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- olhacks.php 29 Sep 2005 08:50:45 -0000 1.7.2.1
+++ olhacks.php 7 May 2007 11:19:36 -0000 1.7.2.2
@@ -173,9 +173,7 @@
copy_header( 'Resent-Date', $msg_headers, $headers );
copy_header( 'Subject', $msg_headers, $headers );
$msg_headers->addHeader('From', $sender);
- foreach( $recipients as $recip ) {
- $msg_headers->addHeader('To', $recip);
- }
+ $msg_headers->addHeader('To', join(', ', $recipients));
$msg_headers->addHeader('X-Kolab-Forwarded', 'TRUE');
$msg_headers->addMIMEHeaders($toppart);
copy_header( 'Content-Transfer-Encoding', $msg_headers, $headers );
From cvs at kolab.org Mon May 7 13:19:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 7 May 2007 13:19:38 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.15.2.22,1.15.2.23
Message-ID: <20070507111938.631811005A3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv30769
Modified Files:
Tag: kolab_2_0_branch
release-notes.txt
Log Message:
Generate a single To: header listing all recipients when forwarding encapsulated iCal messages.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.15.2.22
retrieving revision 1.15.2.23
diff -u -d -r1.15.2.22 -r1.15.2.23
--- release-notes.txt 26 Apr 2007 16:29:58 -0000 1.15.2.22
+++ release-notes.txt 7 May 2007 11:19:36 -0000 1.15.2.23
@@ -23,6 +23,9 @@
- kolab-resource-handlers-0.3.9-2007????
+ Generate a single To: header listing all recipients when forwarding
+ encapsulated iCal messages.
+
kolab/issue974 (Localize the text for rewritten From: headers)
From cvs at kolab.org Mon May 7 22:20:54 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 7 May 2007 22:20:54 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd horde.schema, NONE, 1.1 Makefile.am, 1.21,
1.22 ChangeLog, 1.93, 1.94
Message-ID: <20070507202054.A0C681006AA@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv10180/kolabd
Modified Files:
Makefile.am ChangeLog
Added Files:
horde.schema
Log Message:
2007-05-07 Gunnar Wrobel
* Makefile.am (ldapschema_FILES):
Added the necessary line to install the horde.schema file.
* horde.schema:
Added the horde.schema from horde cvs.
* templates/slapd.conf.template.in:
Added commented horde.schema. Users may uncomment this if they
wish to use horde.
--- NEW FILE: horde.schema ---
# $Horde: horde/scripts/ldap/horde.schema,v 1.28 2006/06/05 18:10:03 chuck Exp $
#
# The offical horde OID assigned by IANA is 13040.
#
# This schema depends on:
# - core.schema
#
#
# Horde attribute branch 1.3.6.1.4.1.13040.2.1.*
# IMP attribute branch 1.3.6.1.4.1.13040.3.1.*
# Turba attribute branch 1.3.6.1.4.1.13040.4.1.*
# Kronolith attribute branch 1.3.6.1.4.1.13040.5.1.*
# Nag attribute branch 1.3.6.1.4.1.13040.6.1.*
# Gollem attribute branch 1.3.6.1.4.1.13040.7.1.*
# Chora attribute branch 1.3.6.1.4.1.13040.8.1.*
# Mnemo attribute branch 1.3.6.1.4.1.13040.9.1.*
# Troll attribute branch 1.3.6.1.4.1.13040.10.1.*
# Klutz attribute branch 1.3.6.1.4.1.13040.11.1.*
# Jonah attribute branch 1.3.6.1.4.1.13040.12.1.*
# Hermes attribute branch 1.3.6.1.4.1.13040.13.1.*
# Juno attribute branch 1.3.6.1.4.1.13040.14.1.*
# Trean attribute branch 1.3.6.1.4.1.13040.15.1.*
# Whups attribute branch 1.3.6.1.4.1.13040.16.1.*
# Ingo attribute branch 1.3.6.1.4.1.13040.17.1.*
# Ansel attribute branch 1.3.6.1.4.1.13040.18.1.*
# Genie attribute branch 1.3.6.1.4.1.13040.19.1.*
# Scry attribute branch 1.3.6.1.4.1.13040.20.1.*
# Wicked attribute branch 1.3.6.1.4.1.13040.21.1.*
# Agora attribute branch 1.3.6.1.4.1.13040.22.1.*
# Goops attribute branch 1.3.6.1.4.1.13040.24.1.*
# Merk attribute branch 1.3.6.1.4.1.13040.25.1.*
# Mimp attribute branch 1.3.6.1.4.1.13040.26.1.*
# Mottle attribute branch 1.3.6.1.4.1.13040.27.1.*
# Nic attribute branch 1.3.6.1.4.1.13040.28.1.*
# Occam attribute branch 1.3.6.1.4.1.13040.29.1.*
# Odin attribute branch 1.3.6.1.4.1.13040.30.1.*
# Rakim attribute branch 1.3.6.1.4.1.13040.31.1.*
# Sesha attribute branch 1.3.6.1.4.1.13040.32.1.*
# Swoosh attribute branch 1.3.6.1.4.1.13040.33.1.*
# Thor attribute branch 1.3.6.1.4.1.13040.34.1.*
# Ulaform attribute branch 1.3.6.1.4.1.13040.35.1.*
# Volos attribute branch 1.3.6.1.4.1.13040.36.1.*
# Jeta attribute branch 1.3.6.1.4.1.13040.37.1.*
#
# Horde objectclass branch 1.3.6.1.4.1.13040.2.2.*
# IMP objectclass branch 1.3.6.1.4.1.13040.3.2.*
# Turba objectclass branch 1.3.6.1.4.1.13040.4.2.*
# Kronolith objectclass branch 1.3.6.1.4.1.13040.5.2.*
# NAG objectclass branch 1.3.6.1.4.1.13040.6.2.*
# Gollem objectclass branch 1.3.6.1.4.1.13040.7.2.*
# Chora objectclass branch 1.3.6.1.4.1.13040.8.2.*
# Mnemo objectclass branch 1.3.6.1.4.1.13040.9.2.*
# Troll objectclass branch 1.3.6.1.4.1.13040.10.2.*
# Klutz objectclass branch 1.3.6.1.4.1.13040.11.2.*
# Jonah objectclass branch 1.3.6.1.4.1.13040.12.2.*
# Hermes objectclass branch 1.3.6.1.4.1.13040.13.2.*
# Juno objectclass branch 1.3.6.1.4.1.13040.14.2.*
# Trean objectclass branch 1.3.6.1.4.1.13040.15.2.*
# Whups objectclass branch 1.3.6.1.4.1.13040.16.2.*
# Ingo objectclass branch 1.3.6.1.4.1.13040.17.2.*
# Ansel objectclass branch 1.3.6.1.4.1.13040.18.2.*
# Genie objectclass branch 1.3.6.1.4.1.13040.19.2.*
# Scry objectclass branch 1.3.6.1.4.1.13040.20.2.*
# Wicked objectclass branch 1.3.6.1.4.1.13040.21.2.*
# Agora objectclass branch 1.3.6.1.4.1.13040.22.2.*
# Goops objectclass branch 1.3.6.1.4.1.13040.24.2.*
# Merk objectclass branch 1.3.6.1.4.1.13040.25.2.*
# Mimp objectclass branch 1.3.6.1.4.1.13040.26.2.*
# Mottle objectclass branch 1.3.6.1.4.1.13040.27.2.*
# Nic objectclass branch 1.3.6.1.4.1.13040.28.2.*
# Occam objectclass branch 1.3.6.1.4.1.13040.29.2.*
# Odin objectclass branch 1.3.6.1.4.1.13040.30.2.*
# Rakim objectclass branch 1.3.6.1.4.1.13040.31.2.*
# Sesha objectclass branch 1.3.6.1.4.1.13040.32.2.*
# Swoosh objectclass branch 1.3.6.1.4.1.13040.33.2.*
# Thor objectclass branch 1.3.6.1.4.1.13040.34.2.*
# Ulaform objectclass branch 1.3.6.1.4.1.13040.35.2.*
# Volos objectclass branch 1.3.6.1.4.1.13040.36.2.*
# Jeta objectclass branch 1.3.6.1.4.1.13040.37.2.*
#
# Horde attribute branch 1.3.6.1.4.1.13040.2.1.*
#
attributetype ( 1.3.6.1.4.1.13040.2.1.1
NAME 'hordePrefs'
DESC 'Horde Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# IMP attribute branch 1.3.6.1.4.1.13040.3.1.*
#
attributetype ( 1.3.6.1.4.1.13040.3.1.1
NAME 'impPrefs'
DESC 'IMP Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Turba attribute branch 1.3.6.1.4.1.13040.4.1.*
#
attributetype ( 1.3.6.1.4.1.13040.4.1.1
NAME 'turbaPrefs'
DESC 'Turba Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
attributetype ( 1.3.6.1.4.1.13040.4.1.2
NAME 'turbaType'
DESC 'Turba Object Type: Contact/List'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{8} )
attributetype ( 1.3.6.1.4.1.13040.4.1.3
NAME 'turbaMembers'
DESC 'Encoded members of a Turba list'
SUP name )
attributetype ( 1.3.6.1.4.1.13040.4.1.4
NAME 'turbaPGPPublicKey'
DESC 'PGP/GPG Public Key'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{4000} )
#
# Kronolith attribute branch 1.3.6.1.4.1.13040.5.1.*
#
attributetype ( 1.3.6.1.4.1.13040.5.1.1
NAME 'kronolithPrefs'
DESC 'Kronolith Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Nag attribute branch 1.3.6.1.4.1.13040.6.1.*
#
attributetype ( 1.3.6.1.4.1.13040.6.1.1
NAME 'nagPrefs'
DESC 'Nag Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Gollem attribute branch 1.3.6.1.4.1.13040.7.1.*
#
attributetype ( 1.3.6.1.4.1.13040.7.1.1
NAME 'gollemPrefs'
DESC 'Gollem Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Chora attribute branch 1.3.6.1.4.1.13040.8.1.*
#
attributetype ( 1.3.6.1.4.1.13040.8.1.1
NAME 'choraPrefs'
DESC 'Chora Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Mnemo attribute branch 1.3.6.1.4.1.13040.9.1.*
#
attributetype ( 1.3.6.1.4.1.13040.9.1.1
NAME 'mnemoPrefs'
DESC 'Mnemo Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Troll attribute branch 1.3.6.1.4.1.13040.10.1.*
#
attributetype ( 1.3.6.1.4.1.13040.10.1.1
NAME 'trollPrefs'
DESC 'Troll Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Klutz attribute branch 1.3.6.1.4.1.13040.11.1.*
#
attributetype ( 1.3.6.1.4.1.13040.11.1.1
NAME 'klutzPrefs'
DESC 'Klutz Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Jonah attribute branch 1.3.6.1.4.1.13040.12.1.*
#
attributetype ( 1.3.6.1.4.1.13040.12.1.1
NAME 'jonahPrefs'
DESC 'Jonah Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Hermes attribute branch 1.3.6.1.4.1.13040.13.1.*
#
attributetype ( 1.3.6.1.4.1.13040.13.1.1
NAME 'hermesPrefs'
DESC 'Hermes Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Juno attribute branch 1.3.6.1.4.1.13040.14.1.*
#
attributetype ( 1.3.6.1.4.1.13040.14.1.1
NAME 'junoPrefs'
DESC 'Juno Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Trean attribute branch 1.3.6.1.4.1.13040.15.1.*
#
attributetype ( 1.3.6.1.4.1.13040.15.1.1
NAME 'treanPrefs'
DESC 'Trean Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Whups attribute branch 1.3.6.1.4.1.13040.16.1.*
#
attributetype ( 1.3.6.1.4.1.13040.16.1.1
NAME 'whupsPrefs'
DESC 'Whups Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Ingo attribute branch 1.3.6.1.4.1.13040.17.1.*
#
attributetype ( 1.3.6.1.4.1.13040.17.1.1
NAME 'ingoPrefs'
DESC 'Ingo Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Ansel attribute branch 1.3.6.1.4.1.13040.18.1.*
#
attributetype ( 1.3.6.1.4.1.13040.18.1.1
NAME 'anselPrefs'
DESC 'Ansel Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Genie attribute branch 1.3.6.1.4.1.13040.19.1.*
#
attributetype ( 1.3.6.1.4.1.13040.19.1.1
NAME 'geniePrefs'
DESC 'Genie Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Scry attribute branch 1.3.6.1.4.1.13040.20.1.*
#
attributetype ( 1.3.6.1.4.1.13040.20.1.1
NAME 'scryPrefs'
DESC 'Scry Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Wicked attribute branch 1.3.6.1.4.1.13040.21.1.*
#
attributetype ( 1.3.6.1.4.1.13040.21.1.1
NAME 'wickedPrefs'
DESC 'Wicked Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Agora attribute branch 1.3.6.1.4.1.13040.22.1.*
#
attributetype ( 1.3.6.1.4.1.13040.22.1.1
NAME 'agoraPrefs'
DESC 'Agora Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Goops attribute branch 1.3.6.1.4.1.13040.24.1.*
#
attributetype ( 1.3.6.1.4.1.13040.24.1.1
NAME 'goopsPrefs'
DESC 'Goops Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Merk attribute branch 1.3.6.1.4.1.13040.25.1.*
#
attributetype ( 1.3.6.1.4.1.13040.25.1.1
NAME 'merkPrefs'
DESC 'Merk Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Mimp attribute branch 1.3.6.1.4.1.13040.26.1.*
#
attributetype ( 1.3.6.1.4.1.13040.26.1.1
NAME 'mimpPrefs'
DESC 'MIMP Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Mottle attribute branch 1.3.6.1.4.1.13040.27.1.*
#
attributetype ( 1.3.6.1.4.1.13040.27.1.1
NAME 'mottlePrefs'
DESC 'Mottle Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Nic attribute branch 1.3.6.1.4.1.13040.28.1.*
#
attributetype ( 1.3.6.1.4.1.13040.28.1.1
NAME 'nicPrefs'
DESC 'NIC Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Occam attribute branch 1.3.6.1.4.1.13040.29.1.*
#
attributetype ( 1.3.6.1.4.1.13040.29.1.1
NAME 'occamPrefs'
DESC 'Occam Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Odin attribute branch 1.3.6.1.4.1.13040.30.1.*
#
attributetype ( 1.3.6.1.4.1.13040.30.1.1
NAME 'odinPrefs'
DESC 'Odin Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Rakim attribute branch 1.3.6.1.4.1.13040.31.1.*
#
attributetype ( 1.3.6.1.4.1.13040.31.1.1
NAME 'rakimPrefs'
DESC 'Rakim Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Sesha attribute branch 1.3.6.1.4.1.13040.32.1.*
#
attributetype ( 1.3.6.1.4.1.13040.32.1.1
NAME 'seshaPrefs'
DESC 'Sesha Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Swoosh attribute branch 1.3.6.1.4.1.13040.33.1.*
#
attributetype ( 1.3.6.1.4.1.13040.33.1.1
NAME 'swooshPrefs'
DESC 'Swoosh Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Thor attribute branch 1.3.6.1.4.1.13040.34.1.*
#
attributetype ( 1.3.6.1.4.1.13040.34.1.1
NAME 'thorPrefs'
DESC 'Thor Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Ulaform attribute branch 1.3.6.1.4.1.13040.35.1.*
#
attributetype ( 1.3.6.1.4.1.13040.35.1.1
NAME 'ulaformPrefs'
DESC 'Ulaform Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Volos attribute branch 1.3.6.1.4.1.13040.36.1.*
#
attributetype ( 1.3.6.1.4.1.13040.36.1.1
NAME 'volosPrefs'
DESC 'Volos Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Jeta attribute branch 1.3.6.1.4.1.13040.37.1.*
#
attributetype ( 1.3.6.1.4.1.13040.37.1.1
NAME 'jetaPrefs'
DESC 'Jeta Preferences'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1024} )
#
# Horde objectclass branch 1.3.6.1.4.1.13040.2.2.*
#
objectclass ( 1.3.6.1.4.1.13040.2.2.1
NAME 'hordePerson'
DESC 'Horde Preferences'
SUP top
AUXILIARY
MAY ( mail $ hordePrefs $ impPrefs $ turbaPrefs $
gollemPrefs $ kronolithPrefs $ mnemoPrefs $
trollPrefs $ nagPrefs $ klutzPrefs $
jonahPrefs $ hermesPrefs $ junoPrefs $
treanPrefs $ whupsPrefs $ ingoPrefs $
geniePrefs $ scryPrefs $ anselPrefs $
wickedPrefs $ choraPrefs $ agoraPrefs $
goopsPrefs $ merkPrefs $ volosPrefs $
mimpPrefs $ mottlePrefs $ nicPrefs $
occamPrefs $ odinPrefs $ rakimPrefs $
seshaPrefs $ swooshPrefs $ thorPrefs $
ulaformPrefs
) )
objectclass ( 1.3.6.1.4.1.13040.2.2.2
NAME 'hordeGroup'
DESC 'Horde Group'
SUP top
AUXILIARY
MAY ( mail ) )
#
# IMP objectclass branch 1.3.6.1.4.1.13040.3.2.*
#
# Turba objectclass branch 1.3.6.1.4.1.13040.4.2.*
objectclass ( 1.3.6.1.4.1.13040.4.2.1
NAME 'turbaContact'
DESC 'Turba Contact'
SUP top
AUXILIARY
MAY ( turbaType $ turbaMembers $ calFBURL )
)
#
# Kronolith objectclass branch 1.3.6.1.4.1.13040.5.2.*
#
#
# Nag objectclass branch 1.3.6.1.4.1.13040.6.2.*
#
#
# Gollem objectclass branch 1.3.6.1.4.1.13040.7.2.*
#
#
# Chora objectclass branch 1.3.6.1.4.1.13040.8.2.*
#
#
# Mnemo objectclass branch 1.3.6.1.4.1.13040.9.2.*
#
#
# Troll objectclass branch 1.3.6.1.4.1.13040.10.2.*
#
#
# Klutz objectclass branch 1.3.6.1.4.1.13040.11.2.*
#
#
# Jonah objectclass branch 1.3.6.1.4.1.13040.12.2.*
#
#
# Hermes objectclass branch 1.3.6.1.4.1.13040.13.2.*
#
#
# Juno objectclass branch 1.3.6.1.4.1.13040.14.2.*
#
#
# Trean objectclass branch 1.3.6.1.4.1.13040.15.2.*
#
#
# Whups objectclass branch 1.3.6.1.4.1.13040.16.2.*
#
#
# Ingo objectclass branch 1.3.6.1.4.1.13040.17.2.*
#
#
# Ansel objectclass branch 1.3.6.1.4.1.13040.18.2.*
#
#
# Genie objectclass branch 1.3.6.1.4.1.13040.19.2.*
#
#
# Scry objectclass branch 1.3.6.1.4.1.13040.20.2.*
#
#
# Wicked objectclass branch 1.3.6.1.4.1.13040.21.2.*
#
#
# Agora objectclass branch 1.3.6.1.4.1.13040.22.2.*
#
#
# Goops objectclass branch 1.3.6.1.4.1.13040.24.2.*
#
#
# Merk objectclass branch 1.3.6.1.4.1.13040.25.2.*
#
#
# Mimp objectclass branch 1.3.6.1.4.1.13040.26.2.*
#
#
# Mottle objectclass branch 1.3.6.1.4.1.13040.27.2.*
#
#
# Nic objectclass branch 1.3.6.1.4.1.13040.28.2.*
#
#
# Occam objectclass branch 1.3.6.1.4.1.13040.29.2.*
#
#
# Odin objectclass branch 1.3.6.1.4.1.13040.30.2.*
#
#
# Rakim objectclass branch 1.3.6.1.4.1.13040.31.2.*
#
#
# Sesha objectclass branch 1.3.6.1.4.1.13040.32.2.*
#
#
# Swoosh objectclass branch 1.3.6.1.4.1.13040.33.2.*
#
#
# Thor objectclass branch 1.3.6.1.4.1.13040.34.2.*
#
#
# Ulaform objectclass branch 1.3.6.1.4.1.13040.35.2.*
#
#
# Volos objectclass branch 1.3.6.1.4.1.13040.36.2.*
#
#
# Jeta objectclass branch 1.3.6.1.4.1.13040.37.2.*
#
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile.am 9 Mar 2006 21:52:02 -0000 1.21
+++ Makefile.am 7 May 2007 20:20:52 -0000 1.22
@@ -95,6 +95,7 @@
EXTRA_DIST += namespace/libexec/stop
ldapschema_FILES = kolab2.schema \
+ horde.schema \
rfc2739.schema
ldapschemadir = $(ldapserver_confdir)/schema
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- ChangeLog 17 Apr 2007 17:09:57 -0000 1.93
+++ ChangeLog 7 May 2007 20:20:52 -0000 1.94
@@ -1,3 +1,18 @@
+2007-05-07 Gunnar Wrobel
+
+ * Makefile.am (ldapschema_FILES):
+
+ Added the necessary line to install the horde.schema file.
+
+ * horde.schema:
+
+ Added the horde.schema from horde cvs.
+
+ * templates/slapd.conf.template.in:
+
+ Added commented horde.schema. Users may uncomment this if they
+ wish to use horde.
+
2007-04-17 Thomas Arendsen Hein
* templates/clamd.conf.template.in: Add ScanPDF option (clamav 0.90.2)
From cvs at kolab.org Mon May 7 22:20:54 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 7 May 2007 22:20:54 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates slapd.conf.template.in, 1.11,
1.12
Message-ID: <20070507202054.9442B1006A4@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv10180/kolabd/templates
Modified Files:
slapd.conf.template.in
Log Message:
2007-05-07 Gunnar Wrobel
* Makefile.am (ldapschema_FILES):
Added the necessary line to install the horde.schema file.
* horde.schema:
Added the horde.schema from horde cvs.
* templates/slapd.conf.template.in:
Added commented horde.schema. Users may uncomment this if they
wish to use horde.
Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- slapd.conf.template.in 27 Feb 2007 18:01:03 -0000 1.11
+++ slapd.conf.template.in 7 May 2007 20:20:52 -0000 1.12
@@ -21,6 +21,7 @@
include @ldapserver_schemadir@/inetorgperson.schema
include @ldapserver_schemadir@/rfc2739.schema
include @ldapserver_schemadir@/kolab2.schema
+#include @ldapserver_schemadir@/horde.schema
pidfile @ldapserver_pidfile@
replica-pidfile @ldapserverslurpd_pidfile@
From cvs at kolab.org Mon May 7 22:27:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 7 May 2007 22:27:23 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.107,1.108
Message-ID: <20070507202723.03CBC1006A4@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv10320
Modified Files:
release-notes.txt
Log Message:
Updated the release notes.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- release-notes.txt 7 May 2007 11:16:58 -0000 1.107
+++ release-notes.txt 7 May 2007 20:27:20 -0000 1.108
@@ -45,6 +45,7 @@
- kolabd-2.1.0-2007????
kolab/issue974 (Localize the text for rewritten From: headers)
+ kolab/issue1608 (A patch for kolabd to include the horde LDAP schema)
- kolab-resource-handlers-2.1.0-2007????
From cvs at kolab.org Tue May 8 16:15:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 8 May 2007 16:15:25 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.108,1.109
Message-ID: <20070508141525.E5F1B1005D4@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv13458
Modified Files:
release-notes.txt
Log Message:
updated release notes for a bug already fixed in 2.1rc2
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- release-notes.txt 7 May 2007 20:27:20 -0000 1.108
+++ release-notes.txt 8 May 2007 14:15:23 -0000 1.109
@@ -115,6 +115,7 @@
Updated cyrus imapd configuration to use cyr_expire.
kolab/issue954 (kolab server rejects mails that should be marked untrusted)
+ kolab/issue1538 (outlook invitation forwarding broken in Kolab server 2.1)
kolab/issue1607 (need to replace gdbm for pfbcache, because of license clash gdbm vs php)
kolab/issue1609 ("kolab --help" tries to execute *all* commands)
kolab/issue1638 (kolabconf generates broken resmgr.conf)
@@ -129,6 +130,7 @@
Improved logging for opening pfbcache.db
kolab/issue954 (kolab server rejects mails that should be marked untrusted)
+ kolab/issue1538 (outlook invitation forwarding broken in Kolab server 2.1)
kolab/issue1607 (need to replace gdbm for pfbcache, because of license clash gdbm vs php)
kolab/issue1659 (Freebusy assumes that all day events last exactly one day)
From cvs at kolab.org Tue May 8 22:34:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 8 May 2007 22:34:19 +0200 (CEST)
Subject: schreiber: doc/www/src index.html.m4,1.116,1.117
Message-ID: <20070508203419.ACE181005B7@lists.intevation.de>
Author: schreiber
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv24609
Modified Files:
index.html.m4
Log Message:
added KDE Client 2.1.7 announcement
Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- index.html.m4 2 May 2007 13:29:25 -0000 1.116
+++ index.html.m4 8 May 2007 20:34:17 -0000 1.117
@@ -46,6 +46,23 @@
+
+
+May 8th, 2007
+»
+ Kolab KDE Client 2.1.7 released
+
+
+
+
+ This release contains several bugfixes and some minor features.
+ See the
+
+ announcement for details.
+
+
+
+
April 20th, 2007
»
@@ -63,6 +80,17 @@
+
+
+
+
+
+
+
+
+
+
+
March 22nd, 2007
»
@@ -79,14 +107,6 @@
Read the announcement
-
-
-
-
-
-
-
-
From cvs at kolab.org Wed May 9 01:45:32 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 9 May 2007 01:45:32 +0200 (CEST)
Subject: steffen: utils/admin generatefb.php,NONE,1.1
Message-ID: <20070508234532.80EB41005B5@lists.intevation.de>
Author: steffen
Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv6609
Added Files:
generatefb.php
Log Message:
script to generate freebusy info for all calendar folders
--- NEW FILE: generatefb.php ---
#!/kolab/bin/php -c /kolab/etc/apache/php.ini
] [--imapport=] [--user=] --password=\n";
echo "Defaults:\n";
echo "\t--imaphost:\t$imaphost\n";
echo "\t--imapport:\t$imapport\n";
echo "\t--user:\t$imapuser\n";
echo "\t--password:\t\n";
exit(-1);
}
/* Parse command line options */
list($options,$args) = Console_Getopt::getopt(Console_Getopt::readPHPArgv(),'h',array('help','imaphost=','imapport=','user=','password='));
foreach( $options as $o ) {
$a = $o[1];
$o = $o[0];
switch($o) {
case 'h':
case '--help': usage(); break;
case '--imaphost': $imaphost = $a; break;
case '--imapport': $imapport = $a; break;
case '--user': $imapuser = $a; break;
case '--password': $imappw = $a; break;
}
}
/* Password must be supplied */
if(!$imappw) usage();
function microtime_float() { return 0; }
function imap_foldername($name)
{
if( $name[0] == '{' ) {
if( ( $pos = strpos($name,'}') ) !== false ) {
$name = substr($name,$pos+1);
}
}
return $name;
}
function imap_foldertype($imap,$name)
{
$annot = imap_getannotation($imap,$name,'/vendor/kolab/folder-type','value.shared');
if( is_array($annot) && array_key_exists('value.shared',$annot) ) return $annot['value.shared'];
else return false;
}
$ldap =& new FreeBusyLDAP( $params['ldap_uri'], $params['base_dn'] );
if( !$ldap->bind( $params['bind_dn'], $params['bind_pw'] ) ) {
notFound( "Bind failed: ".$ldap->error() );
exit;
}
$imap_serverstring = "{".$imaphost.":".$imapport.$imapoptions."}";
$imap = imap_open( $imap_serverstring, $imapuser, $imappw );
$cache =& new FreeBusyCache( $params['cache_dir'], $params['pfb_dbformat'], false );
$xcache =& new FreeBusyCache( $params['cache_dir'], $params['pfb_dbformat'], true );
$list = imap_list($imap, $imap_serverstring, "*");
if (is_array($list)) {
foreach ($list as $val) {
/* Read foldername and type and skip
* anything that is not a calendar folder
*/
$foldername = imap_foldername($val);
$folder = explode('/',$foldername);
$type = imap_foldertype($imap,$foldername);
if( $type != 'event' ) continue;
/* We have to temporarily allow the manager
* to get the folder.
*/
$oldacl = false;
$acl = imap_getacl($imap,$foldername);
if( array_key_exists($imapuser,$acl) ) $oldacl = $acl[$imapuser];
unset($acl);
$rc = imap_setacl($imap,$foldername,$imapuser,'lrs');
if(!$rc) {
echo "imap_setacl failed: " . imap_last_error() . "\n";
}
/* User handling stuff copied from pfb.php
* not sure if we need it, it shouldn't
* be used when the user is manager anyway
*/
$userinfo = $ldap->userInfo( $imapuser );
$uinfo = $ldap->userInfo($folder[0]);
$owner = $uinfo['MAIL'];
if( empty($owner) || false===strpos($owner,'@')) {
// try guessing the domain
$idx = strpos( $imapuser, '@' );
if( $idx !== false ) {
$domain = substr( $imapuser, $idx+1 );
myLog("Trying to append $domain to ".$folder[0], RM_LOG_DEBUG);
$uinfo = $ldap->userInfo($folder[0].'@'.$domain);
$owner = $uinfo['MAIL'];
}
}
/* Deduce domain from foldername
* (the domain is encoded in the foldername
* when the user is domainless
*/
if( ($idx = strpos($foldername,'@')) !== false ) {
$domain = substr( $foldername, $idx+1 );
}
unset($folder[0]);
$folder = join('/', $folder);
$fbpast = $ldap->freeBusyPast();
echo "Processing folder ".$folder."\n";
$fb =& new FreeBusy( $params['cache_dir'], $owner, $imapuser, $imappw, 'localhost', $params['imap_options']
, $uinfo['FBFUTURE'], $fbpast );
$fb->default_domain = $params['email_domain'];
$rc = $fb->imapConnect();
if( $rc === false ) {
echo "Unathorized\n";
unauthorized(imap_last_error());
return false;
}
$rc = $fb->imapOpenMailbox($foldername);
if( $rc === false ) {
notfound( "Folder: ".$fb->foldername.', '.imap_last_error());
return false;
}
$relevance = $fb->getRelevance();
list($vfb,$xvfb) = $fb->generateFreeBusy();
$ts = mktime();
if( PEAR::isError( $vfb ) ) {
unauthorized($vfb->toString());
return false;
}
if(ereg('(.*)@(.*)',$owner,$regs)) {
$owner = $regs[2].'/'.$regs[1];
} else if( ($idx = strpos($folder,'@')) !== false ) {
$owner = $domain.$owner;
$folder = substr($folder,0,$idx);
}
$acl = $fb->getACL();
if( !$cache->store( $owner.'/'.$folder, $vfb, $acl, $relevance ) ) {
trigger_error('Could not store pfb in cache file '.$owner.'/'.$folder
.'.pfb: '.$cache->error, E_USER_WARNING);
}
if( !$xcache->store( $owner.'/'.$folder, $xvfb, $acl, $relevance ) ) {
trigger_error('Could not store xpfb in cache file '.$owner.'/'.$folder
.'.xpfb: '.$cache->error, E_USER_WARNING);
}
/* Restore old ACL */
$rc = imap_setacl($imap,$foldername,$imapuser,$oldacl);
if(!$rc) {
echo "imap_setacl failed: " . imap_last_error() . "\n";
}
}
} else {
echo "imap_getmailboxes failed: " . imap_last_error() . "\n";
}
imap_close($imap);
?>
From cvs at kolab.org Wed May 9 10:36:13 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 9 May 2007 10:36:13 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.36,1.37
Message-ID: <20070509083613.9CEB01006B4@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv18074/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
* php/admin/locale/de/LC_MESSAGES/messages.po:
Fixed
kolab/issue1617 (https://intevation.de/roundup/kolab/issue1617)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog 23 Mar 2007 14:17:00 -0000 1.36
+++ ChangeLog 9 May 2007 08:36:11 -0000 1.37
@@ -1,3 +1,10 @@
+2007-05-09 Gunnar Wrobel
+
+ * php/admin/locale/de/LC_MESSAGES/messages.po:
+
+ Fixed
+ kolab/issue1617 (https://intevation.de/roundup/kolab/issue1617)
+
2007-03-23 Gunnar Wrobel
* www/admin/domainmaintainer/domainmaintainer.php.in:
From cvs at kolab.org Wed May 9 10:36:13 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 9 May 2007 10:36:13 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
messages.po, 1.24, 1.25
Message-ID: <20070509083613.981041006AA@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv18074/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
Modified Files:
messages.po
Log Message:
* php/admin/locale/de/LC_MESSAGES/messages.po:
Fixed
kolab/issue1617 (https://intevation.de/roundup/kolab/issue1617)
Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- messages.po 20 Feb 2007 19:11:56 -0000 1.24
+++ messages.po 9 May 2007 08:36:11 -0000 1.25
@@ -1602,7 +1602,7 @@
#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:269
msgid "Domain maintainer "
-msgstr "Domänen-Verwalter"
+msgstr "Domänen-Verwalter "
#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:270
#: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:274
@@ -2328,7 +2328,7 @@
#: ../include/menu.php:76 ../include/menu.php:93 ../include/menu.php:101
msgid "Domain Maintainers"
-msgstr "Domänen-Verwalter verwalten"
+msgstr "Domänen-Verwalter"
#: ../include/menu.php:78 ../include/menu.php:95
msgid "Manage Domain Maintainers"
From cvs at kolab.org Wed May 9 11:21:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 9 May 2007 11:21:22 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.109,1.110
Message-ID: <20070509092122.3BDE01006B5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv19026
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.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- release-notes.txt 8 May 2007 14:15:23 -0000 1.109
+++ release-notes.txt 9 May 2007 09:21:20 -0000 1.110
@@ -58,6 +58,7 @@
- kolab-webadmin-2.1.0-2007????
kolab/issue1616 (Use different cursor for tags)
+ kolab/issue1617 (fix small inconsistency in german translation)
Changes between 2.1-rc-1 and 2.1-rc-2:
From cvs at kolab.org Wed May 9 12:16:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 9 May 2007 12:16:26 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.110,1.111
Message-ID: <20070509101626.2DA521006C9@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv20565
Modified Files:
release-notes.txt
Log Message:
Fix kolab/issue1560 (postfix modifies message/rfc822 MIME parts):
Tell postfix to not parse and modify headers of message/rfc822 attachments
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- release-notes.txt 9 May 2007 09:21:20 -0000 1.110
+++ release-notes.txt 9 May 2007 10:16:24 -0000 1.111
@@ -45,6 +45,7 @@
- kolabd-2.1.0-2007????
kolab/issue974 (Localize the text for rewritten From: headers)
+ kolab/issue1560 (postfix modifies message/rfc822 MIME parts)
kolab/issue1608 (A patch for kolabd to include the horde LDAP schema)
- kolab-resource-handlers-2.1.0-2007????
From cvs at kolab.org Wed May 9 12:16:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 9 May 2007 12:16:26 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates main.cf.template.in, 1.15,
1.16
Message-ID: <20070509101626.3112F1006CF@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv20565/kolabd/kolabd/templates
Modified Files:
main.cf.template.in
Log Message:
Fix kolab/issue1560 (postfix modifies message/rfc822 MIME parts):
Tell postfix to not parse and modify headers of message/rfc822 attachments
Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- main.cf.template.in 19 Apr 2007 17:26:31 -0000 1.15
+++ main.cf.template.in 9 May 2007 10:16:24 -0000 1.16
@@ -79,6 +79,9 @@
#virtual_mailbox_maps = $virtual_maps
local_recipient_maps = $virtual_maps, $alias_maps
+# Don't parse and modify headers of message/rfc822 attachments
+disable_mime_input_processing = yes
+
## only use local_transport or a higher recipent_limit if issue825 is fixed
# local delivery, not using postfix local(8)
#local_transport = kolabmailboxfilter
From cvs at kolab.org Wed May 9 12:56:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 9 May 2007 12:56:31 +0200 (CEST)
Subject: thomas: utils/admin generatefb.php,1.1,1.2
Message-ID: <20070509105631.3EF7A1006B6@lists.intevation.de>
Author: thomas
Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv21336
Modified Files:
generatefb.php
Log Message:
Allow foldertype 'event.*' in addition to 'event'.
(many folders are marked as 'event.default')
Index: generatefb.php
===================================================================
RCS file: /kolabrepository/utils/admin/generatefb.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- generatefb.php 8 May 2007 23:45:30 -0000 1.1
+++ generatefb.php 9 May 2007 10:56:29 -0000 1.2
@@ -91,8 +91,8 @@
*/
$foldername = imap_foldername($val);
$folder = explode('/',$foldername);
- $type = imap_foldertype($imap,$foldername);
- if( $type != 'event' ) continue;
+ $type = split('\.', imap_foldertype($imap, $foldername), 2);
+ if( $type[0] != 'event' ) continue;
/* We have to temporarily allow the manager
* to get the folder.
From cvs at kolab.org Wed May 9 20:05:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 9 May 2007 20:05:58 +0200 (CEST)
Subject: thomas: utils/admin convert-gdbm-dbload,1.1,1.2
Message-ID: <20070509180558.EB3491006D3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv32143
Modified Files:
convert-gdbm-dbload
Log Message:
Extended convert-gdbm-dbload to move folders and directly call db_load
Index: convert-gdbm-dbload
===================================================================
RCS file: /kolabrepository/utils/admin/convert-gdbm-dbload,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- convert-gdbm-dbload 2 May 2007 16:04:25 -0000 1.1
+++ convert-gdbm-dbload 9 May 2007 18:05:56 -0000 1.2
@@ -10,19 +10,34 @@
"""convert-gdbm-dbload
Usage:
- convert-gdbm-dbload pfbcache.db-gdbm | db_load pfbcache.db-db4
+ - make sure Kolab server is stopped
+ - open a root shell
+ - type the following commands:
-Read gdbm database and dump in a format suitable for db_load.
-db_load is part of Berkeley DB.
+ # cd /kolab/var/kolab/www/freebusy
+ # mv cache cache-old
+ # mkdir cache
+ # chown kolab-n.kolab-n cache
+ # su - kolab-n
+ $ cd /kolab/var/kolab/www/freebusy
+ $ %s cache-old cache
+ $ exit
+
+ - start Kolab
+
+Reads gdbm database and imports it using db_load.
+db_load is part of Berkeley DB and installed with Kolab 2.1.
Requires python (tested with version 2.3) and the python-gdbm module.
"""
__version__ = "$Revision$"
+import os
import sys
import binascii
import gdbm
+import shutil
def error(msg):
@@ -30,17 +45,52 @@
sys.exit(1)
-def main(gdbmfile):
- """Read gdbm database and dump in a format suitable for db_load."""
+def warning(msg):
+ sys.stderr.write('%s\n' % (msg,))
+
+
+def translate_foldername(folder):
+ """user.name at example.com/Fol/d.er -> example.com/user.name/Fol/d.er"""
try:
+ at = folder.index('@')
+ except ValueError:
+ return None
+
+ user = folder[:at]
+ domain, path = folder[at+1:].split('/', 1)
+ return "%s/%s/%s" % (domain, user, path)
+
+
+def quote_folder(folder):
+ """example.com/user.name/Fol/d.er -> example^com/user^name/Fol/d^er"""
+ return folder.replace('.', '^')
+
+
+def copy_folder(source, target):
+ target = quote_folder(target)
+ targetdir = os.path.dirname(target)
+ if not os.path.isdir(targetdir):
+ os.makedirs(targetdir)
+ for ext in ['.pfb', '.pfb.acl', '.xpfb', '.xpfb.acl']:
+ if os.path.isfile(target+ext):
+ warning('Warning: %s already exists' % (target+ext,))
+ else:
+ shutil.copyfile(source+ext, target+ext)
+
+
+def convert_db(old, new):
+ pfbcache = 'pfbcache.db'
+ try:
+ gdbmfile = os.path.join(old, pfbcache)
db = gdbm.open(gdbmfile)
except gdbm.error, inst:
if len(inst.args) == 2:
error('Error opening %s: %s' % (gdbmfile, inst[1]))
else:
error('Error opening %s: %s' % (gdbmfile, inst))
+ db_load = os.popen("db_load '%s'" % os.path.join(new, pfbcache), 'w')
- sys.stdout.write(
+ db_load.write(
"VERSION=3\n"
"format=bytevalue\n"
"type=btree\n"
@@ -50,17 +100,48 @@
k = db.firstkey()
while k != None:
- sys.stdout.write(" %s\n %s\n"
- % (binascii.hexlify(k), binascii.hexlify(db[k])))
+ folders = db[k].split(',')
+ folders.pop(0)
+
+ for folder in folders:
+ newfolder = translate_foldername(folder)
+ if newfolder:
+ if newfolder in folders:
+ folders.remove(folder)
+ sys.stdout.write("not overwriting %s (already exists\n"
+ % newfolder)
+ else:
+ sys.stdout.write("copying folder %s\n" % folder)
+ copy_folder(os.path.join(old, folder),
+ os.path.join(new, newfolder))
+
+ folders.insert(0, '')
+ db_load.write(" %s\n %s\n"
+ % (binascii.hexlify(k),
+ binascii.hexlify(','.join(folders))))
k = db.nextkey(k)
db.close()
- sys.stdout.write("DATA=END\n")
+ db_load.write("DATA=END\n")
+ db_load.close()
+
+
+def main(old, new):
+ """Read gdbm database and dump in a format suitable for db_load."""
+ try:
+ if not os.path.isdir(old):
+ error('Error: %s has to be the source directory' % (old,))
+ if not os.path.isdir(new) or os.listdir(new):
+ error('Error: %s has to be an empty directory' % (new,))
+ except OSError, inst:
+ error('Error opening %s: %s' % (new, inst[1]))
+
+ convert_db(old, new)
+
if __name__ == "__main__":
- if len(sys.argv) != 2:
- error('Usage: %s pfbcache.db-gdbm | db_load pfbcache.db-db4'
- % sys.argv[0])
+ if len(sys.argv) != 3:
+ error('\n'.join(__doc__.splitlines()[1:]) % __file__)
else:
- main(sys.argv[1])
+ main(sys.argv[1], sys.argv[2])
From cvs at kolab.org Thu May 10 11:17:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 May 2007 11:17:57 +0200 (CEST)
Subject: thomas: doc/www/src mirrors.html.m4,1.19,1.20
Message-ID: <20070510091757.BB91C1006DE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv27640
Modified Files:
mirrors.html.m4
Log Message:
kolab.linjection.org mirror is out of date
Index: mirrors.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- mirrors.html.m4 23 Apr 2007 12:44:53 -0000 1.19
+++ mirrors.html.m4 10 May 2007 09:17:55 -0000 1.20
@@ -17,10 +17,12 @@
via http
+
+
From cvs at kolab.org Thu May 10 11:36:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 May 2007 11:36:57 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.111,1.112
Message-ID: <20070510093657.64A191006DC@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv28118
Modified Files:
release-notes.txt
Log Message:
Updated release notes for 2.1.0 release
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- release-notes.txt 9 May 2007 10:16:24 -0000 1.111
+++ release-notes.txt 10 May 2007 09:36:55 -0000 1.112
@@ -1,54 +1,54 @@
-Release notes Kolab2 Server
-(Version 2007????, Kolab Server 2.1.0)
-
-This is a development snapshot of the kolab server leading up to a 2.1
-release. For upgrading and installation instructions, please refer to
-the 1st.README file in the source directory.
-
-These topics need testing in 2.1-rc-???:
+Kolab2 Server Release Notes
+===========================
+(Version 20070510, Kolab Server 2.1.0)
- - Upgrades from Kolab server 2.0, see 1st.README and UPGRADING.20-21.
- - New free/busy code
- - New database backend for the free/busy cache
+For upgrading and installation instructions, please refer to
+the 1st.README file in the package directory. Upgrading from
+Kolab 2.0 servers is documented in the file UPGRADING.20-21
-Differences between Kolab 2.0.x and 2.1:
+Differences between Kolab 2.0 and 2.1:
- Simple multi-domain support
- The Kolab server can now accept mail for multiple email domains.
- There is also a new class of maintainers which are only allowed to
- manage settings for a subset of the mail domains of the kolab
- server.
+ The Kolab server can now accept mail for multiple email domains.
+ There is also a new class of maintainers which are only allowed
+ to manage settings for a subset of the mail domains of the kolab
+ server.
- Hashed IMAP spool
- The default imapd configuration has been changed to enable the
- hashimapspool option. This means that in 2.1 the default directory
- layout of the imapd spool (/kolab/var/imapd/spool/) is different from
- the one in 2.0. When you upgrade from 2.0 it's best to keep using the
- old structure, so remove or comment out the corresponding line in
- /kolab/etc/kolab/templates/imapd.conf.template *before* running
- kolabconf. For new installations the new default setting is recommended
- because it's more efficient especially when you have many mailboxes.
- For details see kolab/issue1089.
+ The default imapd configuration has been changed to enable the
+ hashimapspool option, which allows the Cyrus IMAP server to run
+ more efficiently especially when you have many mailboxes.
+
+ - Improvements, bugfixes and upgraded software components
+
+ The 2.1 release received many improvements and bugfixes for issues
+ found in the 2.0 versions and during the long beta and rc phase.
+ Additionally many software components have been upgraded to new
+ upstream versions.
Changes between 2.1-rc-2 and 2.1.0:
- Documented workaround for libdb3 conflict in README.1st
+ - Documentation
+
+ Documented workaround for libdb3 conflict in README.1st
+
+ Added instructions for automatically upgrading the free/busy cache.
- amavisd-2.3.3-2.5.0_kolab
kolab/issue1447 (Virus Scanning: Inserted note when partially scanned ugly)
- - kolabd-2.1.0-2007????
+ - kolabd-2.1.0-20070510
kolab/issue974 (Localize the text for rewritten From: headers)
kolab/issue1560 (postfix modifies message/rfc822 MIME parts)
kolab/issue1608 (A patch for kolabd to include the horde LDAP schema)
- - kolab-resource-handlers-2.1.0-2007????
+ - kolab-resource-handlers-2.1.0-20070510
Generate a single To: header listing all recipients when forwarding
encapsulated iCal messages.
@@ -56,7 +56,7 @@
kolab/issue974 (Localize the text for rewritten From: headers)
kolab/issue1422 (Dummy freebusy info)
- - kolab-webadmin-2.1.0-2007????
+ - kolab-webadmin-2.1.0-20070510
kolab/issue1616 (Use different cursor for tags)
kolab/issue1617 (fix small inconsistency in german translation)
From cvs at kolab.org Thu May 10 12:05:53 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 May 2007 12:05:53 +0200 (CEST)
Subject: thomas: server obmtool.conf,1.253,1.254
Message-ID: <20070510100553.5343C1006D3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv29074
Modified Files:
obmtool.conf
Log Message:
Bumped obmtool.conf version numbers for 2.1.0
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- obmtool.conf 26 Apr 2007 15:17:42 -0000 1.253
+++ obmtool.conf 10 May 2007 10:05:51 -0000 1.254
@@ -24,7 +24,7 @@
%kolab
echo "---- boot/build ${NODE} %${CMD} ----"
- kolab_version="2.1rc2";
+ kolab_version="2.1.0";
PREFIX=/${CMD};
loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
plusloc='+'
@@ -156,10 +156,10 @@
@install ${loc}pkgconfig-0.19-2.5.0
@install ${altloc}clamav-0.90.2-20070413_kolab
@install ${altloc}perl-kolab-5.8.7-20070420
- @install ${altloc}kolabd-2.1.0-20070420 --define kolab_version=$kolab_version
- @install ${altloc}kolab-webadmin-2.1.0-20070420 --define kolab_version=$kolab_version
+ @install ${altloc}kolabd-2.1.0-20070510 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-webadmin-2.1.0-20070510 --define kolab_version=$kolab_version
@install ${altloc}kolab-horde-framework-2.1.0-20070420 --define kolab_version=$kolab_version
- @install ${altloc}kolab-resource-handlers-2.1.0-20070420 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-resource-handlers-2.1.0-20070510 --define kolab_version=$kolab_version
@install ${altloc}kolab-horde-fbview-2.1.0-20070420 --define kolab_version=$kolab_version
@check
From cvs at kolab.org Thu May 10 12:17:39 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 May 2007 12:17:39 +0200 (CEST)
Subject: thomas: server README.1st,1.56,1.57
Message-ID: <20070510101739.DE0591005BF@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv29382
Modified Files:
README.1st
Log Message:
Updated README for 2.1.0
Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- README.1st 2 May 2007 13:48:54 -0000 1.56
+++ README.1st 10 May 2007 10:17:37 -0000 1.57
@@ -91,8 +91,8 @@
configuration files are regenerated from your templates.
-Upgrade from 2.0 releases to 2.1-versions
------------------------------------------
+Upgrade from Kolab server 2.0 to 2.1
+------------------------------------
Upgrading from Kolab 2.0.x to 2.1 is described in detail in the file
UPGRADING.20-21 in this directory.
@@ -280,20 +280,15 @@
The database backend for the free/busy cache was changed to solve licensing
issues between php4+ and gdbm. See kolab/issue1607 for details.
-The old cache file has to be deleted manually:
+Follow the steps to regenerate the free/busy cache shown in the section
+"Final Steps" in the file UPGRADING.20-21
- rm /kolab/var/kolab/www/freebusy/cache/pfbcache.db
-Then updating the free/busy cache has to be triggered for all calendar
-folders of all accounts:
-- Users need to create or update an appointment in their folders.
-- Resources can be invited to a new appointment or send them an update
- to an existing appointment.
+Upgrade from 2.1-rc-2
+---------------------
+
+Nothing special has to be done for this upgrade.
-Alternatively you can trigger each folder with an https request:
-https://[server]/freebusy/trigger/[email]/[path_to_calendar_folder].pfb,
-e.g. https://kolab.example.com/freebusy/trigger/user at example.com/Calendar.pfb
-(you need to authenticate with the user's credentials)
Known problems and workarounds
From cvs at kolab.org Thu May 10 13:02:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 May 2007 13:02:48 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
freebusyimapcache.class.php, 1.4, 1.5
Message-ID: <20070510110248.ECFE61005BF@lists.intevation.de>
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv30589
Modified Files:
freebusyimapcache.class.php
Log Message:
support for triggering by domainless users
Index: freebusyimapcache.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyimapcache.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- freebusyimapcache.class.php 29 Apr 2007 18:44:45 -0000 1.4
+++ freebusyimapcache.class.php 10 May 2007 11:02:46 -0000 1.5
@@ -140,6 +140,10 @@
$domain = $regs[2].'/';
$domain = str_replace(".", "^", $domain);
$domain = str_replace("\0", "", $domain);
+ } else if( ereg('(.*)@(.*)', $folder_storename, $regs ) ) {
+ // Folder-encoded domain, ie. domainless user
+ $domain = $regs[2].'/';
+ $folder_storename = $regs[1];
} else $domain = '';
$full_path = $this->store_prefix.$domain.$folder_storename.".imapcache";
From cvs at kolab.org Thu May 10 14:45:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 May 2007 14:45:15 +0200 (CEST)
Subject: thomas: utils/admin convert-gdbm-dbload,1.2,1.3
Message-ID: <20070510124515.36FA8101EE9@lists.intevation.de>
Author: thomas
Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv1563
Modified Files:
convert-gdbm-dbload
Log Message:
convert-gdbm-dbload: copy newstyle folders, don't remove from list during loop
Index: convert-gdbm-dbload
===================================================================
RCS file: /kolabrepository/utils/admin/convert-gdbm-dbload,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- convert-gdbm-dbload 9 May 2007 18:05:56 -0000 1.2
+++ convert-gdbm-dbload 10 May 2007 12:45:13 -0000 1.3
@@ -67,7 +67,6 @@
def copy_folder(source, target):
- target = quote_folder(target)
targetdir = os.path.dirname(target)
if not os.path.isdir(targetdir):
os.makedirs(targetdir)
@@ -102,23 +101,29 @@
while k != None:
folders = db[k].split(',')
folders.pop(0)
+ newfolders=['']
for folder in folders:
newfolder = translate_foldername(folder)
if newfolder:
if newfolder in folders:
- folders.remove(folder)
- sys.stdout.write("not overwriting %s (already exists\n"
+ sys.stdout.write("not overwriting %s (already exists)\n"
% newfolder)
else:
sys.stdout.write("copying folder %s\n" % folder)
+ newfolders.append(newfolder)
copy_folder(os.path.join(old, folder),
- os.path.join(new, newfolder))
+ os.path.join(new, quote_folder(newfolder)))
+ else:
+ sys.stdout.write("copying folder %s (already converted)\n"
+ % folder)
+ copy_folder(os.path.join(old, quote_folder(folder)),
+ os.path.join(new, quote_folder(folder)))
+ newfolders.append(folder)
- folders.insert(0, '')
db_load.write(" %s\n %s\n"
% (binascii.hexlify(k),
- binascii.hexlify(','.join(folders))))
+ binascii.hexlify(','.join(newfolders))))
k = db.nextkey(k)
db.close()
From cvs at kolab.org Thu May 10 14:56:13 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 May 2007 14:56:13 +0200 (CEST)
Subject: thomas: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.12,
1.13
Message-ID: <20070510125613.EBC83101EE4@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/raw-howtos
In directory doto:/tmp/cvs-serv2019
Modified Files:
kolab_2.0_to_2.1_upgrade_instructions.txt
Log Message:
Add convert-gdbm-dbload to upgrade instructions
Index: kolab_2.0_to_2.1_upgrade_instructions.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolab_2.0_to_2.1_upgrade_instructions.txt 20 Apr 2007 15:01:05 -0000 1.12
+++ kolab_2.0_to_2.1_upgrade_instructions.txt 10 May 2007 12:56:11 -0000 1.13
@@ -222,7 +222,21 @@
4. The database backend for the free/busy cache was changed to solve licensing
issues between php4+ and gdbm. See kolab/issue1607 for details.
- The old cache file has to be deleted manually:
+ Additionally the directory layout has changed from 2.0 to 2.1.
+
+ To convert the free/busy cache database and directory you can use the
+ Python script "convert-gdbm-dbload" downloadable from Kolab CVS:
+
+ http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/utils/admin/convert-gdbm-dbload
+
+ It prints usage instructions if called without arguments:
+
+ $ python convert-gdbm-dbload
+
+Alternative (manual) method of recreating the free/busy cache:
+
+ If you have very few calendar folders, you can remove the cache manually
+ and recreate its contents by triggering calendar folders:
# rm /kolab/var/kolab/www/freebusy/cache/pfbcache.db
@@ -232,9 +246,5 @@
- Resources can be invited to a new appointment or send them an update
to an existing appointment.
- Alternatively you can trigger each folder with an https request:
- https://[server]/freebusy/trigger/[email]/[path_to_calendar_folder].pfb,
- e.g. https://kolab.example.com/freebusy/trigger/user at example.com/Calendar.pfb
- (you need to authenticate with the user's credentials)
$Id$
From cvs at kolab.org Thu May 10 16:22:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 May 2007 16:22:58 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.117,1.118
Message-ID: <20070510142258.DF109101EF9@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv5178
Modified Files:
index.html.m4
Log Message:
Kolab Server 2.1.0 announcement
Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- index.html.m4 8 May 2007 20:34:17 -0000 1.117
+++ index.html.m4 10 May 2007 14:22:56 -0000 1.118
@@ -48,33 +48,36 @@
-May 8th, 2007
+May 10th, 2007
»
- Kolab KDE Client 2.1.7 released
+ Kolab Server 2.1.0 Final released
- This release contains several bugfixes and some minor features.
+ Source and binary packages for Kolab Server 2.1.0 can be downloaded from
+
erfrakon ,
+
Belnet or
+
Belnet via ftp .
+
See the
-
+
announcement for details.
-April 20th, 2007
+May 8th, 2007
»
- Kolab Server 2.1 Release Candidate 2 released
+ Kolab KDE Client 2.1.7 released
- This release fixes more than 20 problems found in RC 1 and contains updated translations.
- Some security issues were fixed in clamav, spamassassin and file.
+ This release contains several bugfixes and some minor features.
See the
-
+
announcement for details.
@@ -89,6 +92,23 @@
+
+
+
+April 20th, 2007
+»
+ Kolab Server 2.1 Release Candidate 2 released
+
+
+
+
+ This release fixes more than 20 problems found in RC 1 and contains updated translations.
+ Some security issues were fixed in clamav, spamassassin and file.
+ See the
+
+ announcement for details.
+
+
From cvs at kolab.org Thu May 10 18:02:30 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 10 May 2007 18:02:30 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.112,1.113
Message-ID: <20070510160230.33987101EEB@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8319
Modified Files:
release-notes.txt
Log Message:
Updated release notes for post-2.1.0
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- release-notes.txt 10 May 2007 09:36:55 -0000 1.112
+++ release-notes.txt 10 May 2007 16:02:28 -0000 1.113
@@ -1,6 +1,6 @@
Kolab2 Server Release Notes
===========================
-(Version 20070510, Kolab Server 2.1.0)
+(Version 2007????, Kolab Server 2.1.???)
For upgrading and installation instructions, please refer to
the 1st.README file in the package directory. Upgrading from
@@ -28,6 +28,13 @@
found in the 2.0 versions and during the long beta and rc phase.
Additionally many software components have been upgraded to new
upstream versions.
+
+
+Changes between 2.1.0 and 2.1.???:
+
+ - kolab-resource-handlers-2.1.0-2007????
+
+ kolab/issue1693 (Automatically trigger f/b cache regeneration)
Changes between 2.1-rc-2 and 2.1.0:
From cvs at kolab.org Fri May 11 12:06:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 May 2007 12:06:21 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates saslauthd.conf.template.in, 1.2,
1.3
Message-ID: <20070511100621.D8BD7101EFB@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv5820/kolabd/kolabd/templates
Modified Files:
saslauthd.conf.template.in
Log Message:
* templates/saslauthd.conf.template.in (ldap_bind_pw):
kolab/issue1126 (ldap_simple_bind() failed and Domain/Realm not available)
https://intevation.de/roundup/kolab/issue1126
Partial fix for this issue (should remove the "Domain/Realm not
available" message)
Index: saslauthd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/saslauthd.conf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- saslauthd.conf.template.in 15 Jan 2006 10:46:35 -0000 1.2
+++ saslauthd.conf.template.in 11 May 2007 10:06:19 -0000 1.3
@@ -26,6 +26,9 @@
# Specify the password for ldap_bind_dn. Do not specify this parameter
# for the anonymous bind.
+# Avoid the "Domain/Realm not available" error message
+ldap_default_realm: @@@postfix-mydomain@@@
+
ldap_version: 3
#ldap_version: <3> <2|3>
# Specify the LDAP protocol version to use.
From cvs at kolab.org Fri May 11 12:06:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 May 2007 12:06:21 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.94,1.95
Message-ID: <20070511100621.EAEF9101EFE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv5820/kolabd/kolabd
Modified Files:
ChangeLog
Log Message:
* templates/saslauthd.conf.template.in (ldap_bind_pw):
kolab/issue1126 (ldap_simple_bind() failed and Domain/Realm not available)
https://intevation.de/roundup/kolab/issue1126
Partial fix for this issue (should remove the "Domain/Realm not
available" message)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- ChangeLog 7 May 2007 20:20:52 -0000 1.94
+++ ChangeLog 11 May 2007 10:06:19 -0000 1.95
@@ -1,3 +1,13 @@
+2007-05-11 Gunnar Wrobel
+
+ * templates/saslauthd.conf.template.in (ldap_bind_pw):
+
+ kolab/issue1126 (ldap_simple_bind() failed and Domain/Realm not available)
+ https://intevation.de/roundup/kolab/issue1126
+
+ Partial fix for this issue (should remove the "Domain/Realm not
+ available" message)
+
2007-05-07 Gunnar Wrobel
* Makefile.am (ldapschema_FILES):
From cvs at kolab.org Fri May 11 12:06:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 11 May 2007 12:06:22 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.113,1.114
Message-ID: <20070511100622.00531101F06@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv5820
Modified Files:
release-notes.txt
Log Message:
* templates/saslauthd.conf.template.in (ldap_bind_pw):
kolab/issue1126 (ldap_simple_bind() failed and Domain/Realm not available)
https://intevation.de/roundup/kolab/issue1126
Partial fix for this issue (should remove the "Domain/Realm not
available" message)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- release-notes.txt 10 May 2007 16:02:28 -0000 1.113
+++ release-notes.txt 11 May 2007 10:06:19 -0000 1.114
@@ -32,6 +32,10 @@
Changes between 2.1.0 and 2.1.???:
+ - kolabd-2.1.0-20070510
+
+ kolab/issue1126 (ldap_simple_bind() failed and Domain/Realm not available) - partial fix
+
- kolab-resource-handlers-2.1.0-2007????
kolab/issue1693 (Automatically trigger f/b cache regeneration)
From cvs at kolab.org Mon May 14 19:18:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 14 May 2007 19:18:38 +0200 (CEST)
Subject: bernhard: doc/www/src/images
shot-web-admin-2.1.0-domain-maintainers-de-small.png, NONE,
1.1 shot-web-admin-2.1.0-domain-maintainers-de.png, NONE, 1.1
Message-ID: <20070514171838.43DBE1006AC@lists.intevation.de>
Author: bernhard
Update of /kolabrepository/doc/www/src/images
In directory doto:/tmp/cvs-serv1426/images
Added Files:
shot-web-admin-2.1.0-domain-maintainers-de-small.png
shot-web-admin-2.1.0-domain-maintainers-de.png
Log Message:
Adding screenshot for 2.1.0 Web-Admin-Interface.
--- NEW FILE: shot-web-admin-2.1.0-domain-maintainers-de-small.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: shot-web-admin-2.1.0-domain-maintainers-de.png ---
(This appears to be a binary file; contents omitted.)
From cvs at kolab.org Mon May 14 19:18:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 14 May 2007 19:18:38 +0200 (CEST)
Subject: bernhard: doc/www/src screenshots.html.m4,1.5,1.6
Message-ID: <20070514171838.37DB61005A3@lists.intevation.de>
Author: bernhard
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv1426
Modified Files:
screenshots.html.m4
Log Message:
Adding screenshot for 2.1.0 Web-Admin-Interface.
Index: screenshots.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/screenshots.html.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- screenshots.html.m4 28 Jun 2006 15:10:42 -0000 1.5
+++ screenshots.html.m4 14 May 2007 17:18:36 -0000 1.6
@@ -96,6 +96,21 @@
+Kolab Server 2.1.0 Web-Admin-Interface
+
+
+
+
KDE Kolab1 Client (old)
From cvs at kolab.org Thu May 17 13:51:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 17 May 2007 13:51:49 +0200 (CEST)
Subject: martin: doc/www/src default.css,1.8,1.9 screenshots.html.m4,1.6,1.7
Message-ID: <20070517115149.03C621006A8@lists.intevation.de>
Author: martin
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv2082
Modified Files:
default.css screenshots.html.m4
Log Message:
Martin Konold: Patch from Tim Gerundt see also: https://intevation.de/roundup/kolab/issue1735
Index: default.css
===================================================================
RCS file: /kolabrepository/doc/www/src/default.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- default.css 3 Nov 2006 11:13:24 -0000 1.8
+++ default.css 17 May 2007 11:51:46 -0000 1.9
@@ -31,6 +31,10 @@
background: #ccf;
}
+a[name] {
+ background: 0;
+}
+
a.navbar {
color: #fff;
font-weight: normal;
Index: screenshots.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/screenshots.html.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- screenshots.html.m4 14 May 2007 17:18:36 -0000 1.6
+++ screenshots.html.m4 17 May 2007 11:51:46 -0000 1.7
@@ -2,7 +2,15 @@
m4_include(header.html.m4)
This page was updated on: $Date$
-KDE Kolab2 Client 2.1.1 proko2
+Screenshots
+
+
+
@@ -23,9 +31,7 @@
icons
-
-
-
-
-
@@ -94,9 +94,9 @@
-
-Kolab Server 2.1.0 Web-Admin-Interface
+
-
-
-KDE Kolab1 Client (old)
+
-Kolab1 Server Web-Admin-Interface (old)
+
From cvs at kolab.org Tue May 22 15:03:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 22 May 2007 15:03:06 +0200 (CEST)
Subject: ludwig: utils/testing many_addresses.py, NONE, 1.1 many_tasks.py, NONE,
1.1
Message-ID: <20070522130306.D3AF8636774@lists.intevation.de>
Author: ludwig
Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv17409
Added Files:
many_addresses.py many_tasks.py
Log Message:
Ludwig Reiter:
Added to small scripts. Many_addresses.py is used to create a lot of
test contacts, so someone can import them into kontact.
Many_tasks.py is used to create a lot of tasks.
--- NEW FILE: many_addresses.py ---
#!/bin/env python
"""Create many addresses for testing the KDE Kolab Client.
Redirect the output in a file and import this from the KDE Kolab Client.
You need to adapt the script.
This script is Free Software under the GNU General Public License >=v2.
ludwig.reiter at intevation.de
"""
how_many=100
addressfrm="""BEGIN:VCARD
BDAY:1975-03-04T00:00:00Z
EMAIL:%s
FN:Testy%d
N:Tester%d;Testy%d;;;
UID:lakak.101010.Tester%d
VERSION:2.1
END:VCARD
"""
for i in range(how_many):
address = addressfrm % ("test"+str(i)+"@test.hq",i,i,i,i)
print address
--- NEW FILE: many_tasks.py ---
#!/bin/env python
"""Create many ical events for testing the KDE Kolab Client.
Redirect the output in a file and import this from the KDE Kolab Client.
You need to adapt the script.
This script is Free Software under the GNU General Public License >=v2.
ludwig.reiter at intevation.de
"""
import time
how_many=5000
header="""
BEGIN:VCALENDAR
PRODID:-//K Desktop Environment//NONSGML libkcal 3.5//EN
VERSION:1.0"""
footer="""END:VCALENDAR"""
eventfrm="""BEGIN:VTODO
DCREATED:%s
UID:libkcal-126710415.1028.%s
SEQUENCE:0
LAST-MODIFIED:20070515T121704Z
X-ORGANIZER:MAILTO:ltest1 at test.hq
SUMMARY:%s
STATUS:NEEDS_ACTION
PRIORITY:0
END:VTODO
"""
eventtime="20070515T121704Z"
eventname="test #"
print header
for i in range(how_many):
event = eventfrm % (eventtime, eventname + str(i), eventname+ str(i))
print event
print footer
From cvs at kolab.org Wed May 23 11:00:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 May 2007 11:00:20 +0200 (CEST)
Subject: schreiber: doc/www/src i18n.html.m4, 1.3, 1.4 roadmap.html.m4, 1.10,
1.11
Message-ID: <20070523090020.F14CA617E4B@lists.intevation.de>
Author: schreiber
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv25378
Modified Files:
i18n.html.m4 roadmap.html.m4
Log Message:
updated roadmap and language list
Index: i18n.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/i18n.html.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- i18n.html.m4 28 Nov 2005 15:48:31 -0000 1.3
+++ i18n.html.m4 23 May 2007 09:00:18 -0000 1.4
@@ -21,11 +21,13 @@
Français
Néerlandais
+
+ Italien
We expect more soon, e.g.
-Kolab Server 2.1.x will come with Italian and Spanish.
+Kolab Server 2.1.x will come with Spanish.
KDE Kolab Klient
Index: roadmap.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- roadmap.html.m4 12 Mar 2007 11:11:40 -0000 1.10
+++ roadmap.html.m4 23 May 2007 09:00:18 -0000 1.11
@@ -18,66 +18,29 @@
-
-
Kolab Server 2.1 release series
-
-
- Simple version of multi-email-domain support
- (accept mail for more than one domain and have accounts in different
- domains and a new class of maintainers that are restricted to maintaining
- users within a fixed set of domains within the limits of what we can do
- with LDAP ACLs)
- Based on OpenPKG 2.5.
- Code cleanups.
-
-
-On February the 5th, Server 2.1-rc1 was released.
-This series is already used in production since more then a year
-at some sites. You may need to watch the issue tracker and do
-some more test, but if you set a new server, this is the right version to use.
-
-Upcoming Server release 2.1-rc2
-
-Expected: End of March, 2007.
-
-
- Release critical problems fixed.
-
-
-Upcoming Server release 2.1.0
-
-Expected: April, 2007.
-
-
-We expect more soon, e.g.
-Kolab Server 2.1.x will come with Spanish.
+Translations for other languages are welcome, we are especially looking for
+a translation of the
+po file for Spanish .
KDE Kolab Klient
From cvs at kolab.org Wed May 23 16:35:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 May 2007 16:35:43 +0200 (CEST)
Subject: thomas: utils/admin generatefb.php,1.2,1.3
Message-ID: <20070523143543.51304617E44@lists.intevation.de>
Author: thomas
Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv3008
Modified Files:
generatefb.php
Log Message:
removed extra space in php -c option.
php reads this as -c " /kolab/etc/apache/php.ini" otherwise.
Index: generatefb.php
===================================================================
RCS file: /kolabrepository/utils/admin/generatefb.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- generatefb.php 9 May 2007 10:56:29 -0000 1.2
+++ generatefb.php 23 May 2007 14:35:40 -0000 1.3
@@ -1,4 +1,4 @@
-#!/kolab/bin/php -c /kolab/etc/apache/php.ini
+#!/kolab/bin/php -c/kolab/etc/apache/php.ini
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator
In directory doto:/tmp/cvs-serv7188/kolab-webadmin/kolab-webadmin/www/admin/administrator
Modified Files:
admin.php.in
Log Message:
Fixed kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
Index: admin.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- admin.php.in 16 Mar 2007 12:17:24 -0000 1.5
+++ admin.php.in 24 May 2007 09:31:05 -0000 1.6
@@ -175,6 +175,7 @@
switch( $action ) {
case 'firstsave':
debug("adding checkuniquemail to validation");
+ $ldap_object['objectClass'] = array('top','inetOrgPerson', 'kolabInetOrgPerson');
$form->entries['uid']['validation'] = 'checkuniquemail';
case 'save':
if( $form->isSubmitted() ) {
@@ -184,7 +185,6 @@
} else {
debug("Process...");
$ldap_object = array();
- $ldap_object['objectClass'] = array('top','inetOrgPerson', 'kolabInetOrgPerson');
$ldap_object['sn'] = trim($_POST['lastname']);
$ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
if( !empty( $_POST['password_0'] ) ) {
From cvs at kolab.org Thu May 24 11:31:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:31:07 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
maintainer.php.in, 1.6, 1.7
Message-ID: <20070524093107.49582617E42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
In directory doto:/tmp/cvs-serv7188/kolab-webadmin/kolab-webadmin/www/admin/maintainer
Modified Files:
maintainer.php.in
Log Message:
Fixed kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
Index: maintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- maintainer.php.in 16 Mar 2007 12:17:24 -0000 1.6
+++ maintainer.php.in 24 May 2007 09:31:05 -0000 1.7
@@ -172,6 +172,7 @@
switch( $action ) {
case 'firstsave':
debug("adding checkuniquemail to validation");
+ $ldap_object['objectClass'] = array( 'top', 'inetOrgPerson', 'kolabInetOrgPerson');
$form->entries['uid']['validation'] = 'checkuniquemail';
case 'save':
if( $form->isSubmitted() ) {
@@ -181,7 +182,6 @@
} else {
debug("Process...");
$ldap_object = array();
- $ldap_object['objectClass'] = array( 'top', 'inetOrgPerson', 'kolabInetOrgPerson');
$ldap_object['sn'] = trim($_POST['lastname']);
$ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
if( !empty( $_POST['password_0'] ) ) {
From cvs at kolab.org Thu May 24 11:31:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:31:07 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
user.php.in, 1.17, 1.18
Message-ID: <20070524093107.4B932617E4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv7188/kolab-webadmin/kolab-webadmin/www/admin/user
Modified Files:
user.php.in
Log Message:
Fixed kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- user.php.in 16 Mar 2007 12:17:24 -0000 1.17
+++ user.php.in 24 May 2007 09:31:04 -0000 1.18
@@ -128,7 +128,7 @@
foreach( $lst as $alias ) {
debug( "looking at $alias, exluding $dn" );
if( $ldap->countMail( $_SESSION['base_dn'], $alias, $excludedn ) > 0 ) {
- $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collision ');
+ $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collides with an address already used for another user, a vCard or a distribution list. ');
}
}
return $str;
@@ -144,7 +144,7 @@
$str = '';
foreach( $lst as $uid ) {
if( $ldap->countMail( $_SESSION['base_dn'], $uid, $excludedn ) > 0 ) {
- $str .= _('UID ').MySmarty::htmlentities($uid)._(' collision ');
+ $str .= _('UID ').MySmarty::htmlentities($uid)._(' collides with an address already used for another user, a vCard or a distribution list. ');
}
}
return $str;
@@ -496,6 +496,7 @@
switch( $action ) {
case 'firstsave':
debug("adding checkuniquemail to validation");
+ $ldap_object['objectClass'] = array('top', 'inetOrgPerson','kolabInetOrgPerson');
$form->entries['mail']['validation'] = array( $form->entries['mail']['validation'], 'checkuniquemail');
case 'save':
if( $form->isSubmitted() ) {
@@ -504,7 +505,6 @@
$content = $form->outputForm();
} else {
$ldap_object = array();
- $ldap_object['objectClass'] = array('top', 'inetOrgPerson','kolabInetOrgPerson');
$ldap_object['sn'] = trim($_POST['sn']);
$ldap_object['cn'] = trim($_POST['givenname']).' '.$ldap_object['sn'];
$ldap_object['givenName'] = trim($_POST['givenname']);
@@ -624,11 +624,6 @@
'(&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(member='.$ldap->escape($dn).'))',
array( 'dn', 'mail' ) );
$distlists = $ldap->getEntries();
- unset( $distlists['count'] );
- foreach( $distlists as $distlist ) {
- $dlcn = $distlist['mail'][0];
- $errors[] = sprintf(_("Account DN could not be modified, distribution list '%s' depends on it. To modify this account, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
- }
if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
($entry=ldap_first_entry($ldap->connection,$result)) &&
From cvs at kolab.org Thu May 24 11:31:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:31:07 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
domainmaintainer.php.in, 1.8, 1.9
Message-ID: <20070524093107.50AEC617E4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
In directory doto:/tmp/cvs-serv7188/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
Modified Files:
domainmaintainer.php.in
Log Message:
Fixed kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- domainmaintainer.php.in 23 Mar 2007 14:17:00 -0000 1.8
+++ domainmaintainer.php.in 24 May 2007 09:31:05 -0000 1.9
@@ -158,6 +158,7 @@
switch( $action ) {
case 'firstsave':
debug("adding checkuniquemail to validation");
+ $ldap_object['objectClass'] = array( 'top', 'inetOrgPerson', 'kolabInetOrgPerson');
$form->entries['uid']['validation'] = 'checkuniquemail';
case 'save':
if( $form->isSubmitted() ) {
@@ -166,7 +167,6 @@
$content = $form->outputForm();
} else {
$ldap_object = array();
- $ldap_object['objectClass'] = array( 'top', 'inetOrgPerson', 'kolabInetOrgPerson');
$ldap_object['sn'] = trim($_POST['lastname']);
$ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
if( !empty( $_POST['password_0'] ) ) {
From cvs at kolab.org Thu May 24 11:31:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:31:07 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.114,1.115
Message-ID: <20070524093107.DEFDD617E4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv7188
Modified Files:
release-notes.txt
Log Message:
Fixed kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- release-notes.txt 11 May 2007 10:06:19 -0000 1.114
+++ release-notes.txt 24 May 2007 09:31:05 -0000 1.115
@@ -40,6 +40,10 @@
kolab/issue1693 (Automatically trigger f/b cache regeneration)
+ - kolab-webadmin-2.1.0-2007????
+
+ kolab/issue1742 (Do not modify the objectclasses of an existing object)
+
Changes between 2.1-rc-2 and 2.1.0:
From cvs at kolab.org Thu May 24 11:31:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:31:07 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
addr.php.in, 1.5, 1.6
Message-ID: <20070524093107.90515617E42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
In directory doto:/tmp/cvs-serv7188/kolab-webadmin/kolab-webadmin/www/admin/addressbook
Modified Files:
addr.php.in
Log Message:
Fixed kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- addr.php.in 16 Mar 2007 12:17:24 -0000 1.5
+++ addr.php.in 24 May 2007 09:31:05 -0000 1.6
@@ -85,7 +85,7 @@
foreach( $lst as $alias ) {
debug( "looking at $alias, exluding $dn" );
if( $ldap->countMail( $_SESSION['base_dn'], $alias, $excludedn ) > 0 ) {
- $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collision ');
+ $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collides with an address already used for another user, a vCard or a distribution list. ');
}
}
return $str;
@@ -153,6 +153,7 @@
$content = $form->outputForm();
break;
case 'firstsave':
+ $ldap_object = array('objectClass' => array( 'top', 'inetOrgPerson', 'kolabInetOrgPerson' ) );
case 'save':
if( $form->isSubmitted() ) {
if( !$form->validate() ) {
@@ -160,7 +161,6 @@
$content = $form->outputForm();
} else {
$addressbook_root = "cn=external,".$_SESSION['base_dn'];
- $ldap_object = array('objectClass' => array( 'top', 'inetOrgPerson', 'kolabInetOrgPerson' ) );
$firstname = trim($_POST['firstname']);
$lastname = trim($_POST['lastname']);
$ldap_object['sn'] = trim($lastname);
From cvs at kolab.org Thu May 24 11:31:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:31:07 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.37,1.38
Message-ID: <20070524093107.BF440617E42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv7188/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
Fixed kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ChangeLog 9 May 2007 08:36:11 -0000 1.37
+++ ChangeLog 24 May 2007 09:31:05 -0000 1.38
@@ -1,3 +1,14 @@
+2007-05-24 Gunnar Wrobel
+
+ * www/admin/user/user.php.in:
+ * www/admin/maintainer/maintainer.php.in:
+ * www/admin/domainmaintainer/domainmaintainer.php.in:
+ * www/admin/administrator/admin.php.in:
+ * www/admin/addressbook/addr.php.in:
+
+ Fixed
+ kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
+
2007-05-09 Gunnar Wrobel
* php/admin/locale/de/LC_MESSAGES/messages.po:
From cvs at kolab.org Thu May 24 11:50:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:50:00 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.115,1.116
Message-ID: <20070524095000.F3FE2617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv7658
Modified Files:
release-notes.txt
Log Message:
Fixed kolab/issue1620 (https://intevation.de/roundup/kolab/issue1620)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- release-notes.txt 24 May 2007 09:31:05 -0000 1.115
+++ release-notes.txt 24 May 2007 09:49:58 -0000 1.116
@@ -42,6 +42,7 @@
- kolab-webadmin-2.1.0-2007????
+ kolab/issue1620 (fix invalid XHTML in form.class.php)
kolab/issue1742 (Do not modify the objectclasses of an existing object)
From cvs at kolab.org Thu May 24 11:50:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:50:01 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include
form.class.php, 1.29, 1.30
Message-ID: <20070524095001.00A75617E50@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv7658/kolab-webadmin/kolab-webadmin/php/admin/include
Modified Files:
form.class.php
Log Message:
Fixed kolab/issue1620 (https://intevation.de/roundup/kolab/issue1620)
Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- form.class.php 10 Jan 2007 12:25:43 -0000 1.29
+++ form.class.php 24 May 2007 09:49:58 -0000 1.30
@@ -51,22 +51,23 @@
*/
function __toString() {
return sprintf("Debuginformation for class: %s; name: %s; template: %s;", get_class($this), $this->name, $this->template);
- }
+ }
- /*private*/function comment_helper( &$value ) {
- $ast = '';
- if( isset($value['validation'])){
- if( is_array( $value['validation'] ) && in_array( 'notempty', $value['validation']) ) {
- $ast = '* ';
- } else if( $value['validation'] == 'notempty' ) {
- $ast = '* ';
- }
- }
- return $ast.$value['comment'];
+ /*private*/
+ function comment_helper( &$value ) {
+ $ast = '';
+ if( isset($value['validation'])){
+ if( is_array( $value['validation'] ) && in_array( 'notempty', $value['validation']) ) {
+ $ast = '* ';
+ } else if( $value['validation'] == 'notempty' ) {
+ $ast = '* ';
+ }
+ }
+ return $ast.$value['comment'];
}
function outputForm() {
- debug_var_dump($this->entries);
+ debug_var_dump($this->entries);
$str = '
';
/*
if( count( $this->errors ) > 0 ) {
@@ -89,231 +90,231 @@
switch( $value['type'] ) {
case 'hidden': continue;
case 'password':
- if( ereg( 'readonly', $value['attrs'] ) ) {
- // If readonly, skip it -- passwords are at most write-only
- break;
- }
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ // If readonly, skip it -- passwords are at most write-only
+ break;
+ }
case 'input':
case 'text':
- $str .= '
';
- $str .= ''.$value['name'].' ';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= ''.MySmarty::htmlentities($value['value']).'
';
- } else {
- $str .= ' ';
- }
- $str .= ''.KolabForm::comment_helper($value).' ';
- $str .= ' '."\n";
- break;
- case 'email':
- $str .= '
';
- $str .= ''.$value['name'].' ';
- if( strpos($value['value'],'@')===false ) {
- $uname = $value['value'];
- $domain = '';
- } else {
- list($uname,$domain) = split('@',$value['value']);
- }
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= ''.MySmarty::htmlentities($value['value']).'
';
- } else {
- $str .= ' ';
- if( count($value['domains']) == 1 ) {
- $str .= ' ';
- $str .= '@'.MySmarty::htmlentities($value['domains'][0]).' ';
- } else {
- $str .= '@\n";
- foreach( $value['domains'] as $dom ) {
- if( $dom == $domain ) $s = 'selected';
- else $s = '';
- $str .= ''.MySmarty::htmlentities($dom).' '."\n";
- }
- $str .= ' ';
- $str .= '';
- }
- }
- $str .= ''.KolabForm::comment_helper($value).' ';
- $str .= ' '."\n";
- break;
- case 'comment':
- $str .= '
';
- $str .= ''.$value['name'].' ';
- $str .= ''.$value['value'].' ';
- $str .= ''.KolabForm::comment_helper($value).' ';
- $str .= ' '."\n";
- break;
+ $str .= '
';
+ $str .= ''.$value['name'].' ';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= ''.MySmarty::htmlentities($value['value']).'
';
+ } else {
+ $str .= ' ';
+ }
+ $str .= ''.KolabForm::comment_helper($value).' ';
+ $str .= ' '."\n";
+ break;
+ case 'email':
+ $str .= '
';
+ $str .= ''.$value['name'].' ';
+ if( strpos($value['value'],'@')===false ) {
+ $uname = $value['value'];
+ $domain = '';
+ } else {
+ list($uname,$domain) = split('@',$value['value']);
+ }
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= ''.MySmarty::htmlentities($value['value']).'
';
+ } else {
+ $str .= ' ';
+ if( count($value['domains']) == 1 ) {
+ $str .= ' ';
+ $str .= '@'.MySmarty::htmlentities($value['domains'][0]).' ';
+ } else {
+ $str .= '@\n";
+ foreach( $value['domains'] as $dom ) {
+ if( $dom == $domain ) $s = 'selected="selected"';
+ else $s = '';
+ $str .= ''.MySmarty::htmlentities($dom).' '."\n";
+ }
+ $str .= ' ';
+ $str .= '';
+ }
+ }
+ $str .= ''.KolabForm::comment_helper($value).' ';
+ $str .= ' '."\n";
+ break;
+ case 'comment':
+ $str .= '
';
+ $str .= ''.$value['name'].' ';
+ $str .= ''.$value['value'].' ';
+ $str .= ''.KolabForm::comment_helper($value).' ';
+ $str .= ' '."\n";
+ break;
case 'textarea':
- $str .= '
';
- $str .= ''.$value['name'].' ';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= ''.MySmarty::htmlentities($value['value']).'
';
- } else {
- $str .= ' ';
- }
- $str .= ''.KolabForm::comment_helper($value).' ';
- $str .= ' '."\n";
- break;
+ $str .= '
';
+ $str .= ''.$value['name'].' ';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= ''.MySmarty::htmlentities($value['value']).'
';
+ } else {
+ $str .= ' ';
+ }
+ $str .= ''.KolabForm::comment_helper($value).' ';
+ $str .= ' '."\n";
+ break;
case 'checkbox':
- $str .= '
';
- $str .= ''.$value['name'].' ';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= ''.($value['value']?_('Yes'):_('No')).' ';
- } else {
- $str .= ' ';
- }
- $str .= ''.KolabForm::comment_helper($value).' ';
- $str .= ' '."\n";
- break;
- case 'checklist':
- $str .= '
';
- $str .= ''.$value['name'].' ';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= ''.(join(' ',$value['options'])).' ';
- } else {
- $str .= ' ';
- }
- $str .= ''.$value['comment'].' ';
- $str .= ' '."\n";
- break;
- case 'select':
- $str .= '
';
- $str .= ''.$value['name'].' ';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= ''.MySmarty::htmlentities($value['options'][$value['value']]).
- '
';
- } else {
- $str .= ''."\n";
-
- for( $i = 0; $i < count($value['options']); ++$i) {
- if( $i == $value['value'] ) $s = 'selected';
- else $s = '';
- $str .= ''.MySmarty::htmlentities($value['options'][$i]).' '."\n";
- }
- $str .= ' ';
- $str .= ' ';
- }
- $str .= ''.KolabForm::comment_helper($value).' ';
- $str .= ' '."\n";
- break;
- case 'foldertypeselect':
- $str .= '
';
- $str .= ''.$value['name'].' ';
- $entries = array ( '' => _('Unspecified'), 'mail' => _('Mails'), 'task' => _('Tasks'),
- 'journal' => _('Journals'), 'event' => _('Events'),
- 'contact' => _('Contacts'), 'note' => _('Notes'));
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= ''.MySmarty::htmlentities($entries[$value['value']]).
- '
';
- } else {
- $str .= ''."\n";
- foreach ($entries as $id => $title) {
- if ( $value['value'] == $id )
- $s = 'selected';
- else
- $s = '';
-
- $str .= ''.MySmarty::htmlentities($title).' '."\n";
- }
- $str .= ' ';
- $str .= ' ';
- }
- $str .= ''.$value['comment'].' ';
- $str .= ' '."\n";
- break;
+ $str .= '
';
+ $str .= ''.$value['name'].' ';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= ''.($value['value']?_('Yes'):_('No')).' ';
+ } else {
+ $str .= ' ';
+ }
+ $str .= ''.KolabForm::comment_helper($value).' ';
+ $str .= ' '."\n";
+ break;
+ case 'checklist':
+ $str .= '
';
+ $str .= ''.$value['name'].' ';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= ''.(join(' ',$value['options'])).' ';
+ } else {
+ $str .= ' ';
+ }
+ $str .= ''.$value['comment'].' ';
+ $str .= ' '."\n";
+ break;
+ case 'select':
+ $str .= '
';
+ $str .= ''.$value['name'].' ';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= ''.MySmarty::htmlentities($value['options'][$value['value']]).
+ '
';
+ } else {
+ $str .= ''."\n";
+
+ for( $i = 0; $i < count($value['options']); ++$i) {
+ if( $i == $value['value'] ) $s = 'selected="selected"';
+ else $s = '';
+ $str .= ''.MySmarty::htmlentities($value['options'][$i]).' '."\n";
+ }
+ $str .= ' ';
+ $str .= ' ';
+ }
+ $str .= ''.KolabForm::comment_helper($value).' ';
+ $str .= ' '."\n";
+ break;
+ case 'foldertypeselect':
+ $str .= '
';
+ $str .= ''.$value['name'].' ';
+ $entries = array ( '' => _('Unspecified'), 'mail' => _('Mails'), 'task' => _('Tasks'),
+ 'journal' => _('Journals'), 'event' => _('Events'),
+ 'contact' => _('Contacts'), 'note' => _('Notes'));
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= ''.MySmarty::htmlentities($entries[$value['value']]).
+ '
';
+ } else {
+ $str .= ''."\n";
+ foreach ($entries as $id => $title) {
+ if ( $value['value'] == $id )
+ $s = 'selected="selected"';
+ else
+ $s = '';
+
+ $str .= ''.MySmarty::htmlentities($title).' '."\n";
+ }
+ $str .= ' ';
+ $str .= ' ';
+ }
+ $str .= ''.$value['comment'].' ';
+ $str .= ' '."\n";
+ break;
case 'aclselect': // Special Kolab entry for ACLs
- $str .= '
';
- $str .= ''.$value['name'].' ';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- if( $value['user'] ) $str .= ''.MySmarty::htmlentities($value['user']).' '.$value['perm'].' ';
- } else {
- $str .= ' ';
- $str .= ''."\n";
- if( $value['perm'] ) $selected_perm = $value['perm'];
- else $selected_perm = 'all';
- foreach( array( 'none',
- 'post',
- 'read', 'read/post',
- 'append',
- 'write',
- 'read anon',
- 'read anon/post',
- 'read hidden',
- 'read hidden/post',
- 'all' ) as $perm ) {
- if( $perm == $selected_perm ) $s = 'selected';
- else $s = '';
- $str .= ''.$perm.' '."\n";
- }
- $str .= ' ';
- $str .= ' ';
- }
- $str .= ''.KolabForm::comment_helper($value).' ';
- $str .= ' '."\n";
- break;
- case 'resourcepolicy': // Special Kolab entry for group/resource policies
- debug("resourcepolicy");
- $ro = ereg( 'readonly', $value['attrs'] );
- $str .= '
';
- $str .= ''.$value['name'].' ';
- $str .= '';
- $str .= '';
- $i = 0;
- $tmppol = $value['policies'];
- unset($tmppol['']);
- ksort($tmppol);
- $tmppol[''] = 0;
- $policies = array( _('Always accept'),
- _('Always reject'),
- _('Reject if conflicts'),
- _('Manual if conflicts'),
- _('Manual') );
- foreach( $tmppol as $user => $pol ) {
- debug("form: ".$user." => ".$pol);
- if( $ro ) {
- if( !$user ) continue;
- $str .= '';
- if( $user == 'anyone' ) $str .= ''._('Anyone').'
';
- else $str .= ''.MySmarty::htmlentities($user).'
';
- $str .= ' '.MySmarty::htmlentities($policies[$pol]).'
'."\n";
- } else {
- $str .= '';
- if( $user == 'anyone' ) {
- $str .= _('Anyone').' ';
- } else {
- $str .= ' ';
- }
- $str .= ' '."\n";
- $j = 0;
- foreach( $policies as $p ) {
- if( $j == $pol ) {
- $str .= ''.$p.' '."\n";
- } else {
- $str .= ''.$p.' '."\n";
- }
- }
- $i++;
- $str .= ' '."\n";
- }
- }
- $str .= '
';
- $str .= ''.KolabForm::comment_helper($value).' ';
- $str .= ' '."\n";
- break;
+ $str .= '
';
+ $str .= ''.$value['name'].' ';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ if( $value['user'] ) $str .= ''.MySmarty::htmlentities($value['user']).' '.$value['perm'].' ';
+ } else {
+ $str .= ' ';
+ $str .= ''."\n";
+ if( $value['perm'] ) $selected_perm = $value['perm'];
+ else $selected_perm = 'all';
+ foreach( array( 'none',
+ 'post',
+ 'read', 'read/post',
+ 'append',
+ 'write',
+ 'read anon',
+ 'read anon/post',
+ 'read hidden',
+ 'read hidden/post',
+ 'all' ) as $perm ) {
+ if( $perm == $selected_perm ) $s = 'selected="selected"';
+ else $s = '';
+ $str .= ''.$perm.' '."\n";
+ }
+ $str .= ' ';
+ $str .= ' ';
+ }
+ $str .= ''.KolabForm::comment_helper($value).' ';
+ $str .= ' '."\n";
+ break;
+ case 'resourcepolicy': // Special Kolab entry for group/resource policies
+ debug("resourcepolicy");
+ $ro = ereg( 'readonly', $value['attrs'] );
+ $str .= '
';
+ $str .= ''.$value['name'].' ';
+ $str .= '';
+ $str .= '';
+ $i = 0;
+ $tmppol = $value['policies'];
+ unset($tmppol['']);
+ ksort($tmppol);
+ $tmppol[''] = 0;
+ $policies = array( _('Always accept'),
+ _('Always reject'),
+ _('Reject if conflicts'),
+ _('Manual if conflicts'),
+ _('Manual') );
+ foreach( $tmppol as $user => $pol ) {
+ debug("form: ".$user." => ".$pol);
+ if( $ro ) {
+ if( !$user ) continue;
+ $str .= '';
+ if( $user == 'anyone' ) $str .= ''._('Anyone').'
';
+ else $str .= ''.MySmarty::htmlentities($user).'
';
+ $str .= ' '.MySmarty::htmlentities($policies[$pol]).'
'."\n";
+ } else {
+ $str .= '';
+ if( $user == 'anyone' ) {
+ $str .= _('Anyone').' ';
+ } else {
+ $str .= ' ';
+ }
+ $str .= ' '."\n";
+ $j = 0;
+ foreach( $policies as $p ) {
+ if( $j == $pol ) {
+ $str .= ''.$p.' '."\n";
+ } else {
+ $str .= ''.$p.' '."\n";
+ }
+ }
+ $i++;
+ $str .= ' '."\n";
+ }
+ }
+ $str .= '
';
+ $str .= ''.KolabForm::comment_helper($value).' ';
+ $str .= ' '."\n";
+ break;
}
}
$str .= '
';
+ $str .= ' ';
}
}
$str .= '';
- $str .= ''._('* Required field.').'
';
+ $str .= ''._('* Required field.').'
';
$str .= '';
return $str;
}
-
+
function validate() {
$this->errors = array();
foreach( $this->entries as $key => $value ) {
if( !empty( $value['validation'] ) && !ereg( 'readonly', $value['attrs'] ) ) {
- $vv = $value['validation'];
- if( !is_array($vv) ) $va = array($vv);
- else $va = $vv;
- foreach( $va as $v ) {
- //print "validating using $v ";
- if( $v == 'notempty' ) {
- debug("checking nonemptiness of $key: ".KolabForm::getRequestVar($key)." len=".strlen(trim(KolabForm::getRequestVar($key))));
- if( $value['type'] == 'aclselect' ) {
- // ignore
- } else if( $value['type'] == 'email' ) {
- debug('Checking '.$value['name'].': '.$_REQUEST['user_'.$key]);
- if( strlen(trim($_REQUEST['user_'.$key])) == 0 ) {
- $this->errors[] = _('Required field ').$value['name']._(' is empty');
- }
- } else if( strlen( trim($_REQUEST[$key]) ) == 0 ) {
- $this->errors[] = _('Required field ').$value['name']._(' is empty');
- }
- } else {
- if( $value['type'] == 'aclselect' ) {
- $data = $_REQUEST['user_'.$key].' '.$_REQUEST['perm_'.$key];
- } else if( $value['type'] == 'email' ) {
- $data = trim($_REQUEST['user_'.$key]).'@'.trim($_REQUEST['domain_'.$key]);
- } else if( $value['type'] == 'resourcepolicy' ) {
- $i = 0;
- $data = array();
- while( isset($_REQUEST['user_'.$key.'_'.$i] ) ) {
- $data[] = $_REQUEST['user_'.$key.'_'.$i++];
- }
- } else {
- $data = $_REQUEST[$key];
- }
- $errstr = $v( $this, $key, $data );
- if( !empty( $errstr ) ) {
- $this->errors[] = $errstr;
- }
- }
- }
+ $vv = $value['validation'];
+ if( !is_array($vv) ) $va = array($vv);
+ else $va = $vv;
+ foreach( $va as $v ) {
+ //print "validating using $v ";
+ if( $v == 'notempty' ) {
+ debug("checking nonemptiness of $key: ".KolabForm::getRequestVar($key)." len=".strlen(trim(KolabForm::getRequestVar($key))));
+ if( $value['type'] == 'aclselect' ) {
+ // ignore
+ } else if( $value['type'] == 'email' ) {
+ debug('Checking '.$value['name'].': '.$_REQUEST['user_'.$key]);
+ if( strlen(trim($_REQUEST['user_'.$key])) == 0 ) {
+ $this->errors[] = _('Required field ').$value['name']._(' is empty');
+ }
+ } else if( strlen( trim($_REQUEST[$key]) ) == 0 ) {
+ $this->errors[] = _('Required field ').$value['name']._(' is empty');
+ }
+ } else {
+ if( $value['type'] == 'aclselect' ) {
+ $data = $_REQUEST['user_'.$key].' '.$_REQUEST['perm_'.$key];
+ } else if( $value['type'] == 'email' ) {
+ $data = trim($_REQUEST['user_'.$key]).'@'.trim($_REQUEST['domain_'.$key]);
+ } else if( $value['type'] == 'resourcepolicy' ) {
+ $i = 0;
+ $data = array();
+ while( isset($_REQUEST['user_'.$key.'_'.$i] ) ) {
+ $data[] = $_REQUEST['user_'.$key.'_'.$i++];
+ }
+ } else {
+ $data = $_REQUEST[$key];
+ }
+ $errstr = $v( $this, $key, $data );
+ if( !empty( $errstr ) ) {
+ $this->errors[] = $errstr;
+ }
+ }
+ }
}
}
//print_r( $this->errors );
@@ -395,35 +396,35 @@
function setValues() {
foreach( $this->entries as $k => $v ) {
if( $this->entries[$k]['type'] == 'aclselect' ) {
- $this->entries[$k]['user'] = trim($this->value('user_'.$k));
- $this->entries[$k]['perm'] = $this->value('perm_'.$k);
- } else if( $this->entries[$k]['type'] == 'resourcepolicy' ) {
- $i = 0;
- $pols = array();
- while( isset($_REQUEST['user_'.$k.'_'.$i]) ) {
- $pols[trim($_REQUEST['user_'.$k.'_'.$i])]
- = trim($_REQUEST['policy_'.$k.'_'.$i]);
- $i++;
- }
- $this->entries[$k]['policies'] = $pols;
+ $this->entries[$k]['user'] = trim($this->value('user_'.$k));
+ $this->entries[$k]['perm'] = $this->value('perm_'.$k);
+ } else if( $this->entries[$k]['type'] == 'resourcepolicy' ) {
+ $i = 0;
+ $pols = array();
+ while( isset($_REQUEST['user_'.$k.'_'.$i]) ) {
+ $pols[trim($_REQUEST['user_'.$k.'_'.$i])]
+ = trim($_REQUEST['policy_'.$k.'_'.$i]);
+ $i++;
+ }
+ $this->entries[$k]['policies'] = $pols;
} else if( $this->entries[$k]['type'] == 'checkbox' ) {
- $this->entries[$k]['value'] = isset( $_REQUEST[$k] );
+ $this->entries[$k]['value'] = isset( $_REQUEST[$k] );
} else if( $this->entries[$k]['type'] == 'checklist' ) {
- $this->entries[$k]['value'] = $_REQUEST[$k];
+ $this->entries[$k]['value'] = $_REQUEST[$k];
} else if( $this->entries[$k]['type'] == 'password' ) {
- $this->entries[$k]['value'] = $this->value($k);
- } else if( $this->entries[$k]['type'] == 'email' ) {
- $this->entries[$k]['value'] = trim($this->value('user_'.$k)).'@'.trim($this->value('domain_'.$k));
+ $this->entries[$k]['value'] = $this->value($k);
+ } else if( $this->entries[$k]['type'] == 'email' ) {
+ $this->entries[$k]['value'] = trim($this->value('user_'.$k)).'@'.trim($this->value('domain_'.$k));
} else {
- $this->entries[$k]['value'] = trim($this->value($k));
+ $this->entries[$k]['value'] = trim($this->value($k));
}
}
}
/* static */ function getRequestVar($var, $default = false)
{
- if( isset($_REQUEST[$var]) ) return $_REQUEST[$var];
- else return $default;
+ if( isset($_REQUEST[$var]) ) return $_REQUEST[$var];
+ else return $default;
}
@@ -435,12 +436,12 @@
};
/*
- Local variables:
- mode: php
- indent-tabs-mode: t
- tab-width: 4
- buffer-file-coding-system: utf-8
- End:
- vim:encoding=utf-8:
- */
+ Local variables:
+ mode: php
+ indent-tabs-mode: t
+ tab-width: 4
+ buffer-file-coding-system: utf-8
+ End:
+ vim:encoding=utf-8:
+*/
?>
From cvs at kolab.org Thu May 24 11:50:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:50:00 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.38,1.39
Message-ID: <20070524095000.F3279617E42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv7658/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
Fixed kolab/issue1620 (https://intevation.de/roundup/kolab/issue1620)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ChangeLog 24 May 2007 09:31:05 -0000 1.38
+++ ChangeLog 24 May 2007 09:49:58 -0000 1.39
@@ -1,5 +1,10 @@
2007-05-24 Gunnar Wrobel
+ * php/admin/include/form.class.php:
+
+ Fixed
+ kolab/issue1620 (https://intevation.de/roundup/kolab/issue1620)
+
* www/admin/user/user.php.in:
* www/admin/maintainer/maintainer.php.in:
* www/admin/domainmaintainer/domainmaintainer.php.in:
From cvs at kolab.org Thu May 24 11:54:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:54:42 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.116,1.117
Message-ID: <20070524095442.D3144617E42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv7793
Modified Files:
release-notes.txt
Log Message:
Fixed kolab/issue1618 (https://intevation.de/roundup/kolab/issue1618)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- release-notes.txt 24 May 2007 09:49:58 -0000 1.116
+++ release-notes.txt 24 May 2007 09:54:39 -0000 1.117
@@ -42,6 +42,7 @@
- kolab-webadmin-2.1.0-2007????
+ kolab/issue1618 (Add missing headings)
kolab/issue1620 (fix invalid XHTML in form.class.php)
kolab/issue1742 (Do not modify the objectclasses of an existing object)
From cvs at kolab.org Thu May 24 11:54:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 11:54:41 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.39,1.40
Message-ID: <20070524095441.CE1EB60015F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv7793/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
Fixed kolab/issue1618 (https://intevation.de/roundup/kolab/issue1618)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ChangeLog 24 May 2007 09:49:58 -0000 1.39
+++ ChangeLog 24 May 2007 09:54:39 -0000 1.40
@@ -1,5 +1,12 @@
2007-05-24 Gunnar Wrobel
+ * php/admin/templates/maintainerlistall.tpl:
+ * php/admin/templates/domainmaintainerlistall.tpl:
+ * php/admin/templates/addrlistall.tpl:
+
+ Fixed
+ kolab/issue1618 (https://intevation.de/roundup/kolab/issue1618)
+
* php/admin/include/form.class.php:
Fixed
From cvs at kolab.org Thu May 24 12:03:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:03:09 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/templates
maintainerlistall.tpl, 1.1, 1.2 domainmaintainerlistall.tpl, 1.2,
1.3 adminlistall.tpl, 1.1, 1.2
Message-ID: <20070524100309.83D94617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates
In directory doto:/tmp/cvs-serv8076/kolab-webadmin/kolab-webadmin/php/admin/templates
Modified Files:
maintainerlistall.tpl domainmaintainerlistall.tpl
adminlistall.tpl
Log Message:
Fixed kolab/issue1618 (https://intevation.de/roundup/kolab/issue1618)
Index: maintainerlistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/maintainerlistall.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- maintainerlistall.tpl 11 Mar 2005 09:59:05 -0000 1.1
+++ maintainerlistall.tpl 24 May 2007 10:03:07 -0000 1.2
@@ -5,7 +5,7 @@
End:
*}
-
+
{tr msg="Maintainers"}
Index: domainmaintainerlistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/domainmaintainerlistall.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- domainmaintainerlistall.tpl 31 Aug 2005 21:48:48 -0000 1.2
+++ domainmaintainerlistall.tpl 24 May 2007 10:03:07 -0000 1.3
@@ -5,7 +5,7 @@
End:
*}
-
+
{tr msg="Domain Maintainers"}
Index: adminlistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/adminlistall.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- adminlistall.tpl 11 Mar 2005 09:59:05 -0000 1.1
+++ adminlistall.tpl 24 May 2007 10:03:07 -0000 1.2
@@ -5,7 +5,7 @@
End:
*}
-
+
{tr msg="Administrators"}
From cvs at kolab.org Thu May 24 12:03:53 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:03:53 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin print.css, NONE,
1.1
Message-ID: <20070524100353.6884D617E42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin
In directory doto:/tmp/cvs-serv8114/kolab-webadmin/kolab-webadmin/www/admin
Added Files:
print.css
Log Message:
Fixed kolab/issue1619 (https://intevation.de/roundup/kolab/issue1619)
--- NEW FILE: print.css ---
/*
Local variables:
buffer-file-coding-system: utf-8
End:
*/
#topbar {
height: auto;
}
#toplogo {
display: none;
}
#toptitle {
padding: 0;
text-align: left;
border-bottom: 1px solid black;
}
#topuserinfo {
display: none;
}
#topmenu {
display: none;
}
#submenu {
display: none;
}
#maincontent {
margin: 0;
padding: 0;
}
.contenttext {
margin: 0;
}
.contenttable th,
.contenttable td {
border: 1px solid black;
}
From cvs at kolab.org Thu May 24 12:03:53 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:03:53 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.40,1.41
Message-ID: <20070524100353.AB92C617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv8114/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
Fixed kolab/issue1619 (https://intevation.de/roundup/kolab/issue1619)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ChangeLog 24 May 2007 09:54:39 -0000 1.40
+++ ChangeLog 24 May 2007 10:03:51 -0000 1.41
@@ -1,5 +1,11 @@
2007-05-24 Gunnar Wrobel
+ * php/admin/templates/page.tpl.in:
+ * www/admin/print.css:
+
+ Fixed
+ kolab/issue1619 (https://intevation.de/roundup/kolab/issue1619)
+
* php/admin/templates/maintainerlistall.tpl:
* php/admin/templates/domainmaintainerlistall.tpl:
* php/admin/templates/addrlistall.tpl:
From cvs at kolab.org Thu May 24 12:03:53 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:03:53 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.117,1.118
Message-ID: <20070524100353.AFCB0617E50@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8114
Modified Files:
release-notes.txt
Log Message:
Fixed kolab/issue1619 (https://intevation.de/roundup/kolab/issue1619)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- release-notes.txt 24 May 2007 09:54:39 -0000 1.117
+++ release-notes.txt 24 May 2007 10:03:51 -0000 1.118
@@ -43,6 +43,7 @@
- kolab-webadmin-2.1.0-2007????
kolab/issue1618 (Add missing headings)
+ kolab/issue1619 (Add CSS file for printing)
kolab/issue1620 (fix invalid XHTML in form.class.php)
kolab/issue1742 (Do not modify the objectclasses of an existing object)
From cvs at kolab.org Thu May 24 12:03:53 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:03:53 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/templates
page.tpl.in, 1.3, 1.4
Message-ID: <20070524100353.A9093617E42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates
In directory doto:/tmp/cvs-serv8114/kolab-webadmin/kolab-webadmin/php/admin/templates
Modified Files:
page.tpl.in
Log Message:
Fixed kolab/issue1619 (https://intevation.de/roundup/kolab/issue1619)
Index: page.tpl.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/page.tpl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- page.tpl.in 17 Jul 2006 15:43:56 -0000 1.3
+++ page.tpl.in 24 May 2007 10:03:51 -0000 1.4
@@ -15,6 +15,7 @@
+