| 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 <steffen at klaralvdalens-datakonsult.se> (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 <steffen at klaralvdalens-datakonsult.se> (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 <thomas at intevation.de>
+
+ * templates/clamd.conf.template.in: Add ScanPDF option (clamav 0.90.2)
+
2007-04-12 Gunnar Wrobel <p at rdus.de>
* 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 <steffen at klaralvdalens-datakonsult.se> (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 <steffen at klaralvdalens-datakonsult.se> (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 @@
<!-- news item template
<table>
-<tr><td class="newsd">, 2006</td>
+<tr><td class="newsd">Month 99th, 2007</td>
<td class="newsh">»
-
+ CHANGEME
</td></tr>
</table>
<div class="newsb">
-
+ CHANGEME
</div>
<p>
-->
<!-- BEGIN LATEST BLOCK --> <div class="latestnews">
- <table>
+<table>
+<tr><td class="newsd">April 20th, 2007</td>
+<td class="newsh">»
+ Kolab Server 2.1 Release Candidate 2 released
+</td></tr>
+</table>
+<p>
+<div class="newsb">
+ 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
+ <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000049.html">
+ announcement</a> for details.
+</div>
+<p>
+
+<table>
<tr><td class="newsd">March 22nd, 2007</td>
-<td>»KDAB sponsors Horde Development</td></tr></table><p>
+<td>»
+ KDAB sponsors Horde Development
+</td></tr>
+</table>
+<p>
<div class="newsb">
<ul>
<li>
@@ -58,7 +78,7 @@
Konsortium</strong>, 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.
-<br>Read the <a href="http://www.kdab.net/?page=products&sub=kdab-kk-pardus-pr" target="_self">announcement</a>
+<br>Read the <a href="http://www.kdab.net/?page=products&sub=kdab-kk-pardus-pr">announcement</a>
</li>
</ul>
</div>
@@ -66,35 +86,46 @@
<table>
- <tr><td class="newsd">March 15th - 21st, 2007</td>
- <td class="newsh">»CeBIT 2007 - Kolab based events</td></tr></table><p>
+<tr><td class="newsd">March 15th - 21st, 2007</td>
+<td class="newsh">»
+ CeBIT 2007 - Kolab based events
+</td></tr>
+</table>
+<p>
<div class="newsb">
-
+
<ul>
<li>Bernhard Reiter will be representing <strong>Intevation</strong> and the <strong>Kolab Konsortium</strong> at the "Open Source for small business - ExChange alternatives put to test" panel-discussion.<br>
-<a href="http://www.intevation.de/news.en.html#20070308-meet-intevation" target="_self">CeBIT SME Forum - Hall 5, Booth B48, March 21st, 3.15pm - 4.30pm</a>
+<a href="http://www.intevation.de/news.en.html#20070308-meet-intevation">CeBIT SME Forum - Hall 5, Booth B48, March 21st, 3.15pm - 4.30pm</a>
<br><br>
<li>The Kolab-Konsortium Business Partner <strong>Univention</strong> will be presenting the Kolab based Univention Groupware Server (UGS) at Cebit.<br>
-<a href="http://www.univention.de/termin_veranstaltung.html" target="_self">CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover</a>(in German)
+<a href="http://www.univention.de/termin_veranstaltung.html">CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover</a>(in German)
<br>
<br><strong>Univention</strong> 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.<br>
-<a href="http://www.univention.de/vortraege_cebit_2007.html" target="_self">CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</a>(in German)
+<a href="http://www.univention.de/vortraege_cebit_2007.html">CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</a>(in German)
</li></ul>
- </div>
+</div>
<p>
-
- <table>
- <tr><td class="newsd">February 12th 2007</td>
- <td class="newsh">»New KDE Kolab Client released, revision 'proko2.1.6'.</td</tr></table><p>
+<table>
+<tr><td class="newsd">February 12th 2007</td>
+<td class="newsh">»
+ New KDE Kolab Client released, revision 'proko2.1.6'.
+</td></tr>
+</table>
+<p>
<div class="newsb">
- This release contains several fixes and a few new features.
- See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000048.html" target="_self">announcement</a> for details.
- </div>
+ This release contains several fixes and a few new features.
+ See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000048.html">announcement</a> for details.
+</div>
<p>
+</div> <!-- END LATEST BLOCK -->
+
+
+<!-- BEGIN NEWS BLOCK --> <div class="news">
<table>
<tr><td class="newsd">February 5th, 2007</td>
@@ -111,10 +142,6 @@
</div>
<p>
-</div> <!-- END LATEST BLOCK -->
-
-
-<!-- BEGIN NEWS BLOCK --> <div class="news">
<table>
<tr><td class="newsd">January 17th, 2007</td>
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 @@
<table>
<tr><td class="newsd">March 22nd, 2007</td>
-<td>»
+<td class="newsh">»
KDAB sponsors Horde Development
</td></tr>
</table>
<p>
<div class="newsb">
-<ul>
-<li>
In an effort to further increase the quality and usefulness of the Kolab
Groupware Solution, jointly developed by <strong>KDAB</strong> with its partners in the <strong>Kolab
Konsortium</strong>, 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.
<br>Read the <a href="http://www.kdab.net/?page=products&sub=kdab-kk-pardus-pr">announcement</a>
-</li>
-</ul>
</div>
<p>
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 @@
<h2>Kolab Downloads</h2>
-<em>
- Currently there are no binary packages available for the Kolab server due
- to licensing issues with PHP4, see
- <a href="http://intevation.de/roundup/kolab/issue1607">kolab/issue1607</a>
- for details. This will be corrected with the next server release.
-</em>
-
<ul>
<li>
@@ -42,6 +35,14 @@
Marko Uskokovic System Administrator email: uskokovic ,a, etf.bg.ac.yu
-->
</ul>
+
+<em>
+ For server versions before 2.1 rc2 there are no binaries available
+ because of licensing issues with PHP4, see
+ <a href="http://intevation.de/roundup/kolab/issue1607">kolab/issue1607</a>
+ for details.
+</em>
+
<h2>How to become a mirror?</h2>
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</a>
<p>
- <li>Outlook2003 with Toltec2 Setup (aka Doc3, pdf: 1,5MB, sxw: 0.5MB):<br>
- <a href="./doc/doc3-1.34.pdf">Doc3, Version 1.34 as pdf</a>
+ <li>Outlook2003 with Toltec2 Setup (aka Doc3, pdf: 1.8MB, sxw: 0.5MB):<br>
+ <a href="./doc/doc3-1.36.pdf">Doc3, Version 1.36 as pdf</a>
|
<a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/proko2-doc/doc3.sxw"
>CVS HEAD as sxw</a>
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 <suse-tux at gmx.de>
+
+ * freebusy/freebusyimapcache.class.php: Fixed indention. Now it
+ fits better to the other freebusy classes.
+
2007-03-20 Thomas Arendsen Hein <thomas at intevation.de>
* 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 @@
<p>
+
+
+</div> <!-- END LATEST BLOCK -->
+<p>
+
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
<table>
<tr><td class="newsd">March 15th - 21st, 2007</td>
<td class="newsh">»
@@ -101,9 +109,7 @@
<br><strong>Univention</strong> 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.<br>
<a href="http://www.univention.de/vortraege_cebit_2007.html">CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</a>(in German)
</li></ul>
-</div>
-<p>
-
+ </div>
<table>
<tr><td class="newsd">February 12th 2007</td>
@@ -118,10 +124,8 @@
</div>
<p>
-</div> <!-- END LATEST BLOCK -->
-<!-- BEGIN NEWS BLOCK --> <div class="news">
<table>
<tr><td class="newsd">February 5th, 2007</td>
@@ -137,8 +141,6 @@
announcement</a> for details.
</div>
<p>
-
-
<table>
<tr><td class="newsd">January 17th, 2007</td>
<td class="newsh">»
@@ -151,90 +153,6 @@
<a href="http://www.kolab.org/pipermail/kolab-announce/2007/000046.html">
announcement</a> for details.
</div>
-<p>
-
-<table>
-<tr><td class="newsd">December 19th, 2006</td>
-<td class="newsh">»
- Security Advisory 14 for Kolab Server (ClamAV)
-</td></tr>
-</table>
-<div class="newsb">
- Two remotely exploitable vulnerabilities were found in the Clam AntiVirus package.
- A new ClamAV RPM with a fix is available. See the
- <a href="security/kolab-vendor-notice-14.txt">Kolab Security
- Issue 14</a> for details.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">November 16th, 2006</td>
-<td class="newsh">»
- Kolab Server 2.1 Beta 3 released
-</td></tr>
-</table>
-<div class="newsb">
- This release fixes more than 30 problems found in Beta 2 and
- includes the security updates published until now. See
- the <a
- href="http://www.kolab.org/pipermail/kolab-announce/2006/000044.html">release
- notes</a> for more details and information on upgrading from Kolab
- Server 2.0 to 2.1.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">November 14th - 16th, 2006</td>
-<td class="newsh">»
- Presentation of Kolab-based UGS at LinuxWorld Expo 2006 in Cologne, Germany
-</td></tr>
-</table>
-<div class="newsb">
- <a href="http://www.univention.de/english.html">Univention</a>,
- business partner of <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a>,
- presents the Kolab-based Univention Groupware Server
- (UGS).<br />
- (Special exhibition Linux/OS in the office, hall 11.2)
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">November 2nd, 2006</td>
-<td class="newsh">»
- New KDE Kolab Client released, revision 'proko2 2.1.5'.
-</td></tr>
-</table>
-<div class="newsb">
- This release contains several fixes and
- a few new features, like:
- <p>
-
- <ul>
- <li>Ability to add ones signature at top of
- an email reply automatically
- or manually at the cursor position.
-
- <li>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.
- </ul>
- The release notes contain the full list.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">October 23th - 27th, 2006</td>
-<td class="newsh">»
- Kolab-based UGS at Systems 2006 in Munich, Germany
-</td></tr>
-</table>
-<div class="newsb">
- <a href="http://www.univention.de/english.html">Univention</a>,
- business partner of <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a>,
- shows the Kolab-based Univention Groupware Server (UGS).<br />
- (hall 3 - booth A3.441-12)
-</div>
-<p>
</div> <!-- END NEWS BLOCK -->
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 @@
<div class="news">
<table>
+<tr><td class="newsd">December 19th, 2006</td>
+<td class="newsh">»
+ Security Advisory 14 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+ Two remotely exploitable vulnerabilities were found in the Clam AntiVirus package.
+ A new ClamAV RPM with a fix is available. See the
+ <a href="security/kolab-vendor-notice-14.txt">Kolab Security
+ Issue 14</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">November 16th, 2006</td>
+<td class="newsh">»
+ Kolab Server 2.1 Beta 3 released
+</td></tr>
+</table>
+<div class="newsb">
+ This release fixes more than 30 problems found in Beta 2 and
+ includes the security updates published until now. See
+ the <a
+ href="http://www.kolab.org/pipermail/kolab-announce/2006/000044.html">release
+ notes</a> for more details and information on upgrading from Kolab
+ Server 2.0 to 2.1.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">November 14th - 16th, 2006</td>
+<td class="newsh">»
+ Presentation of Kolab-based UGS at LinuxWorld Expo 2006 in Cologne, Germany
+</td></tr>
+</table>
+<div class="newsb">
+ <a href="http://www.univention.de/english.html">Univention</a>,
+ business partner of <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a>,
+ presents the Kolab-based Univention Groupware Server
+ (UGS).<br />
+ (Special exhibition Linux/OS in the office, hall 11.2)
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">November 2nd, 2006</td>
+<td class="newsh">»
+ New KDE Kolab Client released, revision 'proko2 2.1.5'.
+</td></tr>
+</table>
+<div class="newsb">
+ This release contains several fixes and
+ a few new features, like:
+ <p>
+
+ <ul>
+ <li>Ability to add ones signature at top of
+ an email reply automatically
+ or manually at the cursor position.
+
+ <li>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.
+ </ul>
+ The release notes contain the full list.
+</div>
+
+
+<table>
+<tr><td class="newsd">October 23th - 27th, 2006</td>
+<td class="newsh">»
+ Kolab-based UGS at Systems 2006 in Munich, Germany
+</td></tr>
+</table>
+<div class="newsb">
+ <a href="http://www.univention.de/english.html">Univention</a>,
+ business partner of <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a>,
+ shows the Kolab-based Univention Groupware Server (UGS).<br />
+ (hall 3 - booth A3.441-12)
+</div>
+
+
+<table>
<tr><td class="newsd">October 19th, 2006</td>
<td class="newsh">»
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 <thomas at intevation.de>
#
# 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 @@
<meta name="description" content="Kolab aims to maintain and enhance a complete Free Software groupware solution for UNIX platforms." />
<meta name="keywords" content= "kolab,groupware,free software,open source, unix,gnu/linux,linux,kde,outlook,kmail,korganizer,kontact,horde,email" />
<link rel="stylesheet" type="text/css" media="screen" href="default.css" />
+<link rel="stylesheet" type="text/css" media="print" href="print.css" />
<link rel="shortcut icon" type="image/png" href="images/favicon.png" />
</head>
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 <label> 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 <thomas at intevation.de>
+
+ * resmgr/olhacks.php.in: Generate a single To: header listing all
+ recipients when forwarding encapsulated iCal messages.
+
2007-04-29 Marcus Hüwe <suse-tux at gmx.de>
* 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 <p at rdus.de>
* 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 <p at rdus.de>
+
+ * 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 <thomas at intevation.de>
* 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 <p at rdus.de>
* 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 @@
<!-- BEGIN LATEST BLOCK --> <div class="latestnews">
+
+<table>
+<tr><td class="newsd">May 8th, 2007</td>
+<td class="newsh">»
+ Kolab KDE Client 2.1.7 released
+</td></tr>
+</table>
+<p>
+<div class="newsb">
+ This release contains several bugfixes and some minor features.<br>
+ See the
+ <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000050.html">
+ announcement</a> for details.
+</div>
+<p>
+
+
<table>
<tr><td class="newsd">April 20th, 2007</td>
<td class="newsh">»
@@ -63,6 +80,17 @@
<p>
+
+
+
+</div> <!-- END LATEST BLOCK -->
+<p>
+
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
+
+
<table>
<tr><td class="newsd">March 22nd, 2007</td>
<td class="newsh">»
@@ -79,14 +107,6 @@
<br>Read the <a href="http://www.kdab.net/?page=products&sub=kdab-kk-pardus-pr">announcement</a>
</div>
<p>
-
-
-
-
-</div> <!-- END LATEST BLOCK -->
-<p>
-
-<!-- BEGIN NEWS BLOCK --> <div class="news">
<table>
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
<?php
error_reporting(E_ALL);
$kolab_prefix = '/kolab';
$kolab_includepath = $kolab_prefix.'/var/kolab/php:'.$kolab_prefix.'/var/kolab/php/pear';
ini_set('include_path', $kolab_includepath.':'.ini_get('include_path'));
require_once($kolab_prefix.'/etc/resmgr/freebusy.conf');
if ( empty($params['ldap_classname_suffix'])) $params['ldap_classname_suffix'] = '';
require_once('freebusy/freebusyldap'.$params['ldap_classname_suffix'].'.class.php');
require_once('freebusy/freebusycache.class.php');
require_once('freebusy/freebusy.class.php');
require_once('Console/Getopt.php');
$imaphost = 'localhost';
$imapport = 143;
$imapoptions = '/notls';
$imapuser = 'manager';
$imappw = false;
/* Print out usage info */
function usage()
{
global $imaphost,$imapport,$imapuser,$imappw;
echo "Script for updating freebusy information on a kolab server.\n";
echo "Normal usage is:\n";
echo "\tsudo -u kolab-n ./generatefb.php [--help] [--imaphost=<imap hostname>] [--imapport=<imap port>] [--user=<manager user>] --password=<manager 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<no default>\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 <p at rdus.de>
+
+ * php/admin/locale/de/LC_MESSAGES/messages.po:
+
+ Fixed
+ kolab/issue1617 (https://intevation.de/roundup/kolab/issue1617)
+
2007-03-23 Gunnar Wrobel <p at rdus.de>
* 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 <label> 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 <a href="http://www.erfrakon.de/mirrors/ftp.kolab.org/">http</a>
<!-- contact martin.konold ,a, erfrakon.de -->
+<!-- currently not available:
<li>
<b>Linjection</b> <br>
via
<a href="http://kolab.linjection.org/">http</a>
+-->
<!-- contact Markus Oliver Markert <email ,a, markus-markert.de> -->
<!-- currently not available:
@@ -30,7 +32,8 @@
<a href="ftp://mirror.etf.bg.ac.yu/kolab/">ftp</a>
|
rsync://mirror.etf.bg.ac.yu/kolab
- <!- - contact mirroradmin ,a, etf.bg.ac.yu,
+-->
+ <!-- contact mirroradmin ,a, etf.bg.ac.yu,
RC ETF Admin <rc-admin ,a, etf.bg.ac.yu,
Marko Uskokovic System Administrator email: uskokovic ,a, etf.bg.ac.yu
-->
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 <label> 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 @@
<table>
-<tr><td class="newsd">May 8th, 2007</td>
+<tr><td class="newsd">May 10th, 2007</td>
<td class="newsh">»
- Kolab KDE Client 2.1.7 released
+ Kolab Server 2.1.0 Final released
</td></tr>
</table>
<p>
<div class="newsb">
- This release contains several bugfixes and some minor features.<br>
+ Source and binary packages for Kolab Server 2.1.0 can be downloaded from
+ <a href="http://www.erfrakon.de/mirrors/ftp.kolab.org/server/release/kolab-server-2.1.0/">erfrakon</a>,
+ <a href="http://ftp.belnet.be/packages/kolab/server/release/kolab-server-2.1.0/">Belnet</a> or
+ <a href="ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-2.1.0/">Belnet via ftp</a>.
+ <br>
See the
- <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000050.html">
+ <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000051.html">
announcement</a> for details.
</div>
<p>
<table>
-<tr><td class="newsd">April 20th, 2007</td>
+<tr><td class="newsd">May 8th, 2007</td>
<td class="newsh">»
- Kolab Server 2.1 Release Candidate 2 released
+ Kolab KDE Client 2.1.7 released
</td></tr>
</table>
<p>
<div class="newsb">
- 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.<br>
See the
- <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000049.html">
+ <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000050.html">
announcement</a> for details.
</div>
<p>
@@ -89,6 +92,23 @@
<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
+<table>
+<tr><td class="newsd">April 20th, 2007</td>
+<td class="newsh">»
+ Kolab Server 2.1 Release Candidate 2 released
+</td></tr>
+</table>
+<p>
+<div class="newsb">
+ 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
+ <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000049.html">
+ announcement</a> for details.
+</div>
+<p>
<table>
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 <p at rdus.de>
+
+ * 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 <p at rdus.de>
* 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 @@
</tr>
<table>
+<h2>Kolab Server 2.1.0 Web-Admin-Interface</h2>
+
+<table cellpadding="14" bgcolor="white" width="100%">
+<tr valign="bottom">
+<td align="center">
+ <a href="images/shot-web-admin-2.1.0-domain-maintainers-de.png"
+ ><img src="images/shot-web-admin-2.1.0-domain-maintainers-de-small.png"
+ width=200 height=115 border=0
+ ><br /><br />Email-Domain-Maintainers German Localisation (1072x615 100 kByte)</a>
+</td>
+<td align="center">
+</td>
+</table>
+
+
<h2>KDE Kolab1 Client (old)</h2>
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)
<div id="date">This page was updated on:<br />$Date$</div>
-<h2>KDE Kolab2 Client 2.1.1 proko2</h2>
+<h1>Screenshots</h1>
+<ul>
+ <li><a href="#kde_kolab2_client">KDE Kolab2 Client 2.1.1 proko2</a></li>
+ <li><a href="#kolab2_webadmin">Kolab Server 2.1.0 Web-Admin-Interface</a></li>
+ <li><a href="#kde_kolab1_client">KDE Kolab1 Client (old)</a></li>
+ <li><a href="#kolab1_webadmin">Kolab1 Server Web-Admin-Interface (old)</a></li>
+</ul>
+
+<h2><a name="kde_kolab2_client">KDE Kolab2 Client 2.1.1 proko2</a></h2>
<table cellpadding="14" bgcolor="white" width="100%">
<tr valign="bottom">
@@ -23,9 +31,7 @@
icons
</td>
</tr>
-</table>
-<table cellpadding="14" bgcolor="white" width="100%">
<tr valign="bottom">
<td align="center" width="50%">
<a href="images/mail_reply1.png">
@@ -43,9 +49,7 @@
week. Events can be categorized with colors.
</td>
</tr>
-</table>
-<table cellpadding="14" bgcolor="white" width="100%">
<tr valign="bottom">
<td align="center" width="50%">
<a href="images/calendar_edit1.png">
@@ -63,8 +67,6 @@
</td>
</tr>
-</table>
-<table cellpadding="14" bgcolor="white" width="100%">
<tr valign="bottom">
<td align="center" width="50%">
<a href="images/contacts_overview1.png">
@@ -81,9 +83,7 @@
<br>Create a new contact and store a lot of additional information.
</td>
</tr>
-</table>
-<table cellpadding="14" bgcolor="white" width="100%">
<tr valign="bottom">
<td align="center" width="50%">
<a href="images/tasks_overview1.png">
@@ -94,9 +94,9 @@
</td>
<td></td>
</tr>
-<table>
+</table>
-<h2>Kolab Server 2.1.0 Web-Admin-Interface</h2>
+<h2><a name="kolab2_webadmin">Kolab Server 2.1.0 Web-Admin-Interface</a></h2>
<table cellpadding="14" bgcolor="white" width="100%">
<tr valign="bottom">
@@ -110,9 +110,7 @@
</td>
</table>
-
-
-<h2>KDE Kolab1 Client (old)</h2>
+<h2><a name="kde_kolab1_client">KDE Kolab1 Client (old)</a></h2>
<table cellpadding="14" bgcolor="white" width="100%">
<tr valign="bottom">
@@ -147,7 +145,7 @@
</td>
</table>
-<h2>Kolab1 Server Web-Admin-Interface (old)</h2>
+<h2><a name="kolab1_webadmin">Kolab1 Server Web-Admin-Interface (old)</a></h2>
<table cellpadding="14" bgcolor="white" width="100%">
<tr valign="bottom">
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
<li>
Néerlandais
+ <li>
+ Italien
</ul>
</strong>
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.
<h3>KDE Kolab Klient</h3>
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 @@
<p>
-
-<h2>Kolab Server 2.1 release series</h2>
-
-<ul>
-<li> Simple version of multi-email-domain support<br>
- (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)
-<li> Based on OpenPKG 2.5.
-<li> Code cleanups.
-</ul>
-
-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.
-
-<h3>Upcoming Server release 2.1-rc2</h3>
-
-Expected: End of March, 2007.
-
-<ul>
-<li> Release critical problems fixed.
-</ul>
-
-<h3>Upcoming Server release 2.1.0</h3>
-
-Expected: April, 2007.
-
-<ul>
-<li> Similiar to 2.1-rc2.
+<h2>Future Kolab Server 2.2 release series</h2>
+<ul><li>
+Update to a new OpenPKG version.</li>
+<li>Integration of new upstream versions (with many of the kolab patches
+integrated).</li><li>
+Re-engineerd Horde-based web client as modular add-on package for the Kolab
+Server/OpenPKG version.</li><li>
+More complete support for 64 bit architectures.</li>
</ul>
-<h2>Kolab Server 2.0 old release series</h2>
-
-Current release is: 2.0.4 (20060811)
-<h3>Further Server 2.0.x releases</h3>
+<h2>Future Kolab Server 3.0 release series</h2>
-The maintenance of the 2.0-branch will only include high priority
-security or other fixes.
+The roadmap for the next major version is currently being discussed within the
+community.
+<p>
-<h2>Future Kolab Server 3.0 release series</h2>
+<h2>Kolab Server 2.1 release series</h2>
-The goals for Kolab Server 3 are not fixed yet
-and will be determined by the community (which includes
-the companies, like the Kolab-Konsortium).
-The issue tracker has some ideas and proposals already.
+Current is 2.1.0 Final
-<p>
-Expected: Start of development Q1 2008
-<ul>
-<li> Full multi-email-domain support<br>
- (LDAP structure to have subtrees for each domain etc.)
-<li> Fully supported Web-Client (might be an optional module and
- available earlier as well).
-</ul>
m4_include(footer.html.m4)
From cvs at kolab.org Wed May 23 12:13:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 May 2007 12:13:52 +0200 (CEST)
Subject: thomas: doc/www/src i18n.html.m4,1.4,1.5
Message-ID: <20070523101352.1DCB8617E49@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv27383
Modified Files:
i18n.html.m4
Log Message:
Italien -> Italiano, and we don't have a translation for Spanish.
Index: i18n.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/i18n.html.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- i18n.html.m4 23 May 2007 09:00:18 -0000 1.4
+++ i18n.html.m4 23 May 2007 10:13:49 -0000 1.5
@@ -19,15 +19,16 @@
English
<li>
Français
- <li>
+ <li>
Néerlandais
<li>
- Italien
+ Italiano
</ul>
</strong>
-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
+<a href="/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po">po file for Spanish</a>.
<h3>KDE Kolab Klient</h3>
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
<?php
error_reporting(E_ALL);
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/administrator
admin.php.in, 1.5, 1.6
Message-ID: <20070524093107.54C39617E4F@lists.intevation.de>
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 <br />');
+ $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collides with an address already used for another user, a vCard or a distribution list.<br />');
}
}
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 <br />');
+ $str .= _('UID ').MySmarty::htmlentities($uid)._(' collides with an address already used for another user, a vCard or a distribution list.<br />');
}
}
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 <a href='@webserver_web_prefix@/admin/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> 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 <br />');
+ $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collides with an address already used for another user, a vCard or a distribution list.<br />');
}
}
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 <p at rdus.de>
+
+ * 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 <p at rdus.de>
* 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 = '<span class="required_asterisk">*</span> ';
- } else if( $value['validation'] == 'notempty' ) {
- $ast = '<span class="required_asterisk">*</span> ';
- }
- }
- 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 = '<span class="required_asterisk">*</span> ';
+ } else if( $value['validation'] == 'notempty' ) {
+ $ast = '<span class="required_asterisk">*</span> ';
+ }
+ }
+ return $ast.$value['comment'];
}
function outputForm() {
- debug_var_dump($this->entries);
+ debug_var_dump($this->entries);
$str = '<div class="contentform">';
/*
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 .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p><input name="'
- .$key.'" type="hidden" value="'.MySmarty::htmlentities($value['value']).'" /></td>';
- } else {
- $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="'.MySmarty::htmlentities($value['value']).'" '
- .MySmarty::htmlentities($value['attrs']).' size="'.$size.'" /></td>';
- }
- $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
- $str .= '</tr>'."\n";
- break;
- case 'email':
- $str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
- if( strpos($value['value'],'@')===false ) {
- $uname = $value['value'];
- $domain = '';
- } else {
- list($uname,$domain) = split('@',$value['value']);
- }
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p><input name="user_'.$key.'" type="hidden" value="'.
- MySmarty::htmlentities($uname).'" /><input name="domain_'.$key.'" type="hidden" value="'.
- MySmarty::htmlentities($domain).'" /></td>';
- } else {
- $str .= '<td><input name="user_'.$key.'" type="text" value="'.MySmarty::htmlentities($uname).'" '
- .$value['attrs'].' size="'.($size-40).'" />';
- if( count($value['domains']) == 1 ) {
- $str .= '<input name="domain_'.$key.'" type="hidden" value="'.MySmarty::htmlentities($value['domains'][0]).'" />';
- $str .= '<span class="ctrl">@'.MySmarty::htmlentities($value['domains'][0]).'</span></td>';
- } else {
- $str .= '@<select name="domain_'.$key.'" '.$value['attrs']." >\n";
- foreach( $value['domains'] as $dom ) {
- if( $dom == $domain ) $s = 'selected';
- else $s = '';
- $str .= '<option value="'.MySmarty::htmlentities($dom).'" '.$s.'>'.MySmarty::htmlentities($dom).'</option>'."\n";
- }
- $str .= '</select>';
- $str .= '</td>';
- }
- }
- $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
- $str .= '</tr>'."\n";
- break;
- case 'comment':
- $str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
- $str .= '<td>'.$value['value'].'</td>';
- $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
- $str .= '</tr>'."\n";
- break;
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p><input name="'
+ .$key.'" type="hidden" value="'.MySmarty::htmlentities($value['value']).'" /></td>';
+ } else {
+ $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="'.MySmarty::htmlentities($value['value']).'" '
+ .MySmarty::htmlentities($value['attrs']).' size="'.$size.'" /></td>';
+ }
+ $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
+ $str .= '</tr>'."\n";
+ break;
+ case 'email':
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ if( strpos($value['value'],'@')===false ) {
+ $uname = $value['value'];
+ $domain = '';
+ } else {
+ list($uname,$domain) = split('@',$value['value']);
+ }
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p><input name="user_'.$key.'" type="hidden" value="'.
+ MySmarty::htmlentities($uname).'" /><input name="domain_'.$key.'" type="hidden" value="'.
+ MySmarty::htmlentities($domain).'" /></td>';
+ } else {
+ $str .= '<td><input name="user_'.$key.'" type="text" value="'.MySmarty::htmlentities($uname).'" '
+ .$value['attrs'].' size="'.($size-40).'" />';
+ if( count($value['domains']) == 1 ) {
+ $str .= '<input name="domain_'.$key.'" type="hidden" value="'.MySmarty::htmlentities($value['domains'][0]).'" />';
+ $str .= '<span class="ctrl">@'.MySmarty::htmlentities($value['domains'][0]).'</span></td>';
+ } else {
+ $str .= '@<select name="domain_'.$key.'" '.$value['attrs']." >\n";
+ foreach( $value['domains'] as $dom ) {
+ if( $dom == $domain ) $s = 'selected="selected"';
+ else $s = '';
+ $str .= '<option value="'.MySmarty::htmlentities($dom).'" '.$s.'>'.MySmarty::htmlentities($dom).'</option>'."\n";
+ }
+ $str .= '</select>';
+ $str .= '</td>';
+ }
+ }
+ $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
+ $str .= '</tr>'."\n";
+ break;
+ case 'comment':
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ $str .= '<td>'.$value['value'].'</td>';
+ $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
+ $str .= '</tr>'."\n";
+ break;
case 'textarea':
- $str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p></td>';
- } else {
- $str .= '<td><textarea name="'.$key.'" rows="5" cols="'.$size.'" '.$value['attrs'].' onkeypress="javascript:textareakeypress()">'.MySmarty::htmlentities($value['value']).'</textarea></td>';
- }
- $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
- $str .= '</tr>'."\n";
- break;
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p></td>';
+ } else {
+ $str .= '<td><textarea name="'.$key.'" rows="5" cols="'.$size.'" '.$value['attrs'].' onkeypress="javascript:textareakeypress()">'.MySmarty::htmlentities($value['value']).'</textarea></td>';
+ }
+ $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
+ $str .= '</tr>'."\n";
+ break;
case 'checkbox':
- $str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><span class="ctrl">'.($value['value']?_('Yes'):_('No')).'</span></td>';
- } else {
- $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="on" '.($value['value']?'checked':'').' '.$value['attrs'].' /></td>';
- }
- $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
- $str .= '</tr>'."\n";
- break;
- case 'checklist':
- $str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><span class="ctrl">'.(join('<br/>',$value['options'])).'</span></td>';
- } else {
- $str .= '<td><table class="contentform">';
- foreach( $value['options'] as $opt ) {
- if( is_array( $value['value'] ) ) $checked = ( in_array($opt ,$value['value'] ))?"checked":"";
- else $checked = "";
- //debug("Checking if $opt is in ".join(",",$value['value'])." :$checked");
- $str .= '<tr><td><input name="'.$key.'[]" type="checkbox" value="'.MySmarty::htmlentities($opt).'" '.$value['attrs']." $checked /></td><td>"
- .MySmarty::htmlentities($opt).'</td></tr>';
- }
- $str .= '</table></td>';
- }
- $str .= '<td>'.$value['comment'].'</td>';
- $str .= '</tr>'."\n";
- break;
- case 'select':
- $str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['options'][$value['value']]).
- '<input type="hidden" name="'.$key.'" value="'.MySmarty::htmlentities($value['value']).'" /></p></td>';
- } else {
- $str .= '<td><select name="'.$key.'" '.$value['attrs'].' >'."\n";
-
- for( $i = 0; $i < count($value['options']); ++$i) {
- if( $i == $value['value'] ) $s = 'selected';
- else $s = '';
- $str .= '<option value="'.$i.'" '.$s.'>'.MySmarty::htmlentities($value['options'][$i]).'</option>'."\n";
- }
- $str .= '</select>';
- $str .= '</td>';
- }
- $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
- $str .= '</tr>'."\n";
- break;
- case 'foldertypeselect':
- $str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
- $entries = array ( '' => _('Unspecified'), 'mail' => _('Mails'), 'task' => _('Tasks'),
- 'journal' => _('Journals'), 'event' => _('Events'),
- 'contact' => _('Contacts'), 'note' => _('Notes'));
- if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($entries[$value['value']]).
- '<input type="hidden" name="'.$key.'" value="'.MySmarty::htmlentities($value['value']).'" /></p></td>';
- } else {
- $str .= '<td><select name="'.$key.'" '.$value['attrs'].' >'."\n";
- foreach ($entries as $id => $title) {
- if ( $value['value'] == $id )
- $s = 'selected';
- else
- $s = '';
-
- $str .= '<option value="'.$id.'" '.$s.'>'.MySmarty::htmlentities($title).'</option>'."\n";
- }
- $str .= '</select>';
- $str .= '</td>';
- }
- $str .= '<td>'.$value['comment'].'</td>';
- $str .= '</tr>'."\n";
- break;
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><span class="ctrl">'.($value['value']?_('Yes'):_('No')).'</span></td>';
+ } else {
+ $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="on" '.($value['value']?'checked':'').' '.$value['attrs'].' /></td>';
+ }
+ $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
+ $str .= '</tr>'."\n";
+ break;
+ case 'checklist':
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><span class="ctrl">'.(join('<br/>',$value['options'])).'</span></td>';
+ } else {
+ $str .= '<td><table class="contentform">';
+ foreach( $value['options'] as $opt ) {
+ if( is_array( $value['value'] ) ) $checked = ( in_array($opt ,$value['value'] ))?"checked":"";
+ else $checked = "";
+ //debug("Checking if $opt is in ".join(",",$value['value'])." :$checked");
+ $str .= '<tr><td><input name="'.$key.'[]" type="checkbox" value="'.MySmarty::htmlentities($opt).'" '.$value['attrs']." $checked /></td><td>"
+ .MySmarty::htmlentities($opt).'</td></tr>';
+ }
+ $str .= '</table></td>';
+ }
+ $str .= '<td>'.$value['comment'].'</td>';
+ $str .= '</tr>'."\n";
+ break;
+ case 'select':
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['options'][$value['value']]).
+ '<input type="hidden" name="'.$key.'" value="'.MySmarty::htmlentities($value['value']).'" /></p></td>';
+ } else {
+ $str .= '<td><select name="'.$key.'" '.$value['attrs'].' >'."\n";
+
+ for( $i = 0; $i < count($value['options']); ++$i) {
+ if( $i == $value['value'] ) $s = 'selected="selected"';
+ else $s = '';
+ $str .= '<option value="'.$i.'" '.$s.'>'.MySmarty::htmlentities($value['options'][$i]).'</option>'."\n";
+ }
+ $str .= '</select>';
+ $str .= '</td>';
+ }
+ $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
+ $str .= '</tr>'."\n";
+ break;
+ case 'foldertypeselect':
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ $entries = array ( '' => _('Unspecified'), 'mail' => _('Mails'), 'task' => _('Tasks'),
+ 'journal' => _('Journals'), 'event' => _('Events'),
+ 'contact' => _('Contacts'), 'note' => _('Notes'));
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><p class="ctrl">'.MySmarty::htmlentities($entries[$value['value']]).
+ '<input type="hidden" name="'.$key.'" value="'.MySmarty::htmlentities($value['value']).'" /></p></td>';
+ } else {
+ $str .= '<td><select name="'.$key.'" '.$value['attrs'].' >'."\n";
+ foreach ($entries as $id => $title) {
+ if ( $value['value'] == $id )
+ $s = 'selected="selected"';
+ else
+ $s = '';
+
+ $str .= '<option value="'.$id.'" '.$s.'>'.MySmarty::htmlentities($title).'</option>'."\n";
+ }
+ $str .= '</select>';
+ $str .= '</td>';
+ }
+ $str .= '<td>'.$value['comment'].'</td>';
+ $str .= '</tr>'."\n";
+ break;
case 'aclselect': // Special Kolab entry for ACLs
- $str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
- if( ereg( 'readonly', $value['attrs'] ) ) {
- if( $value['user'] ) $str .= '<td><span class="ctrl">'.MySmarty::htmlentities($value['user']).'</span> <span class="ctrl">'.$value['perm'].'</span></td>';
- } else {
- $str .= '<td><input name="user_'.$key.'" type="'.$value['type'].'" size="'.($size-15).'" value="'
- .MySmarty::htmlentities($value['user']).'" '.$value['attrs'].' />';
- $str .= '<select name="perm_'.$key.'">'."\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 .= '<option value="'.$perm.'"'.$s.' >'.$perm.'</option>'."\n";
- }
- $str .= '</select>';
- $str .= '</td>';
- }
- $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
- $str .= '</tr>'."\n";
- break;
- case 'resourcepolicy': // Special Kolab entry for group/resource policies
- debug("resourcepolicy");
- $ro = ereg( 'readonly', $value['attrs'] );
- $str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
- $str .= '<td>';
- $str .= '<table>';
- $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 .= '<tr><td>';
- if( $user == 'anyone' ) $str .= '<p class="ctrl">'._('Anyone').'</p>';
- else $str .= '<p class="ctrl">'.MySmarty::htmlentities($user).'</p>';
- $str .= '</td><td><p class="ctrl">'.MySmarty::htmlentities($policies[$pol]).'</p></td></tr>'."\n";
- } else {
- $str .= '<tr><td>';
- if( $user == 'anyone' ) {
- $str .= _('Anyone').'<input type="hidden" name="user_'.$key.'_'.$i.'" value="'.MySmarty::htmlentities($user).'" '.$value['attrs'].' />';
- } else {
- $str .= '<input name="user_'.$key.'_'.$i.'" type="text" size="'.($size-20)
- .'" value="'.MySmarty::htmlentities($user).'" '.$value['attrs'].' />';
- }
- $str .= '</td><td><select name="policy_'.$key.'_'.$i.'">'."\n";
- $j = 0;
- foreach( $policies as $p ) {
- if( $j == $pol ) {
- $str .= '<option value="'.$j++.'" selected>'.$p.'</option>'."\n";
- } else {
- $str .= '<option value="'.$j++.'">'.$p.'</option>'."\n";
- }
- }
- $i++;
- $str .= '</select></td></tr>'."\n";
- }
- }
- $str .= '</table></td>';
- $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
- $str .= '</tr>'."\n";
- break;
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ if( ereg( 'readonly', $value['attrs'] ) ) {
+ if( $value['user'] ) $str .= '<td><span class="ctrl">'.MySmarty::htmlentities($value['user']).'</span> <span class="ctrl">'.$value['perm'].'</span></td>';
+ } else {
+ $str .= '<td><input name="user_'.$key.'" type="text" size="'.($size-15).'" value="'
+ .MySmarty::htmlentities($value['user']).'" '.$value['attrs'].' />';
+ $str .= '<select name="perm_'.$key.'">'."\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 .= '<option value="'.$perm.'"'.$s.' >'.$perm.'</option>'."\n";
+ }
+ $str .= '</select>';
+ $str .= '</td>';
+ }
+ $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
+ $str .= '</tr>'."\n";
+ break;
+ case 'resourcepolicy': // Special Kolab entry for group/resource policies
+ debug("resourcepolicy");
+ $ro = ereg( 'readonly', $value['attrs'] );
+ $str .= '<tr>';
+ $str .= '<td>'.$value['name'].'</td>';
+ $str .= '<td>';
+ $str .= '<table>';
+ $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 .= '<tr><td>';
+ if( $user == 'anyone' ) $str .= '<p class="ctrl">'._('Anyone').'</p>';
+ else $str .= '<p class="ctrl">'.MySmarty::htmlentities($user).'</p>';
+ $str .= '</td><td><p class="ctrl">'.MySmarty::htmlentities($policies[$pol]).'</p></td></tr>'."\n";
+ } else {
+ $str .= '<tr><td>';
+ if( $user == 'anyone' ) {
+ $str .= _('Anyone').'<input type="hidden" name="user_'.$key.'_'.$i.'" value="'.MySmarty::htmlentities($user).'" '.$value['attrs'].' />';
+ } else {
+ $str .= '<input name="user_'.$key.'_'.$i.'" type="text" size="'.($size-20)
+ .'" value="'.MySmarty::htmlentities($user).'" '.$value['attrs'].' />';
+ }
+ $str .= '</td><td><select name="policy_'.$key.'_'.$i.'">'."\n";
+ $j = 0;
+ foreach( $policies as $p ) {
+ if( $j == $pol ) {
+ $str .= '<option value="'.$j++.'" selected="selected">'.$p.'</option>'."\n";
+ } else {
+ $str .= '<option value="'.$j++.'">'.$p.'</option>'."\n";
+ }
+ }
+ $i++;
+ $str .= '</select></td></tr>'."\n";
+ }
+ }
+ $str .= '</table></td>';
+ $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
+ $str .= '</tr>'."\n";
+ break;
}
}
$str .= '<tr><td colspan="3" align="center"><input type="submit" name="submit_'.$this->name.'" value="'
@@ -324,56 +325,56 @@
if( !isset( $value['comment'] ) ) $value['comment'] = '';
if( !isset( $value['attrs'] ) ) $value['attrs'] = '';
if( $value['type'] == 'hidden' ) {
- $str .= '<input name="'.$key.'" type="hidden" value="'.MySmarty::htmlentities($value['value']).'" '.$value['attrs'].' />';
+ $str .= '<input name="'.$key.'" type="hidden" value="'.MySmarty::htmlentities($value['value']).'" '.$value['attrs'].' />';
}
}
$str .= '</form>';
- $str .= '<div class="required_asterisk">'._('* Required field.').'</div>';
+ $str .= '<div class="required_asterisk">'._('* Required field.').'</div>';
$str .= '</div>';
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 <br/>";
- 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 <br/>";
+ 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 <p at rdus.de>
+ * 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 <p at rdus.de>
+ * 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:
*}
<div class="contenttext">
-
+<h3>{tr msg="Maintainers"}</h3>
</div>
<table class="contenttable" cellpadding="0" cellspacing="1px">
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:
*}
<div class="contenttext">
-
+<h3>{tr msg="Domain Maintainers"}</h3>
</div>
<table class="contenttable" cellpadding="0" cellspacing="1px">
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:
*}
<div class="contenttext">
-
+<h3>{tr msg="Administrators"}</h3>
</div>
<table class="contenttable" cellpadding="0" cellspacing="1px">
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 <p at rdus.de>
+ * 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 @@
<meta name="description" content="Kolab Administration Webinterface" />
<meta name="keywords" content="Linux, Unix, Groupware, Email, Calendar" />
<link rel="stylesheet" type="text/css" href="{$stylesheet|default:"$topdir/style.css"}" />
+<link rel="stylesheet" type="text/css" media="print" href="{"$topdir/print.css"}" />
<script type="text/javascript">
<!--
From cvs at kolab.org Thu May 24 12:17:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:17:26 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include
form.class.php, 1.30, 1.31
Message-ID: <20070524101726.F1227617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv8816/kolab-webadmin/kolab-webadmin/php/admin/include
Modified Files:
form.class.php
Log Message:
Fixed kolab/issue1610 (https://intevation.de/roundup/kolab/issue1610)
Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- form.class.php 24 May 2007 09:49:58 -0000 1.30
+++ form.class.php 24 May 2007 10:17:24 -0000 1.31
@@ -97,12 +97,13 @@
case 'input':
case 'text':
$str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><label>'.$value['name'].'</label></td>';
$str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p><input name="'
.$key.'" type="hidden" value="'.MySmarty::htmlentities($value['value']).'" /></td>';
} else {
- $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="'.MySmarty::htmlentities($value['value']).'" '
+ $str .= '<td><label for="'.$key.'">'.$value['name'].'</label></td>';
+ $str .= '<td><input name="'.$key.'" id="'.$key.'" type="'.$value['type'].'" value="'.MySmarty::htmlentities($value['value']).'" '
.MySmarty::htmlentities($value['attrs']).' size="'.$size.'" /></td>';
}
$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
@@ -110,7 +111,6 @@
break;
case 'email':
$str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
if( strpos($value['value'],'@')===false ) {
$uname = $value['value'];
$domain = '';
@@ -122,13 +122,14 @@
MySmarty::htmlentities($uname).'" /><input name="domain_'.$key.'" type="hidden" value="'.
MySmarty::htmlentities($domain).'" /></td>';
} else {
- $str .= '<td><input name="user_'.$key.'" type="text" value="'.MySmarty::htmlentities($uname).'" '
+ $str .= '<td><label for="user_'.$key.'">'.$value['name'].'</label></td>';
+ $str .= '<td><input name="user_'.$key.'" id="user_'.$key.'" type="text" value="'.MySmarty::htmlentities($uname).'" '
.$value['attrs'].' size="'.($size-40).'" />';
if( count($value['domains']) == 1 ) {
$str .= '<input name="domain_'.$key.'" type="hidden" value="'.MySmarty::htmlentities($value['domains'][0]).'" />';
$str .= '<span class="ctrl">@'.MySmarty::htmlentities($value['domains'][0]).'</span></td>';
} else {
- $str .= '@<select name="domain_'.$key.'" '.$value['attrs']." >\n";
+ $str .= '<label for="domain_'.$key.'">@</label><select name="domain_'.$key.'" id="domain_'.$key.'" '.$value['attrs']." >\n";
foreach( $value['domains'] as $dom ) {
if( $dom == $domain ) $s = 'selected="selected"';
else $s = '';
@@ -150,29 +151,31 @@
break;
case 'textarea':
$str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><label>'.$value['name'].'</label></td>';
$str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['value']).'</p></td>';
} else {
- $str .= '<td><textarea name="'.$key.'" rows="5" cols="'.$size.'" '.$value['attrs'].' onkeypress="javascript:textareakeypress()">'.MySmarty::htmlentities($value['value']).'</textarea></td>';
+ $str .= '<td><label for="'.$key.'">'.$value['name'].'</label></td>';
+ $str .= '<td><textarea name="'.$key.'" id="'.$key.'" rows="5" cols="'.$size.'" '.$value['attrs'].' onkeypress="javascript:textareakeypress()">'.MySmarty::htmlentities($value['value']).'</textarea></td>';
}
$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
$str .= '</tr>'."\n";
break;
case 'checkbox':
$str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><label>'.$value['name'].'</label></td>';
$str .= '<td><span class="ctrl">'.($value['value']?_('Yes'):_('No')).'</span></td>';
} else {
- $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="on" '.($value['value']?'checked':'').' '.$value['attrs'].' /></td>';
+ $str .= '<td><label for="'.$key.'">'.$value['name'].'</label></td>';
+ $str .= '<td><input name="'.$key.'" id="'.$key.'" type="'.$value['type'].'" value="on" '.($value['value']?'checked':'').' '.$value['attrs'].' /></td>';
}
$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
$str .= '</tr>'."\n";
break;
case 'checklist':
$str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
+ $str .= '<td><label>'.$value['name'].'</label></td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
$str .= '<td><span class="ctrl">'.(join('<br/>',$value['options'])).'</span></td>';
} else {
@@ -191,12 +194,13 @@
break;
case 'select':
$str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><label>'.$value['name'].'</label></td>';
$str .= '<td><p class="ctrl">'.MySmarty::htmlentities($value['options'][$value['value']]).
'<input type="hidden" name="'.$key.'" value="'.MySmarty::htmlentities($value['value']).'" /></p></td>';
} else {
- $str .= '<td><select name="'.$key.'" '.$value['attrs'].' >'."\n";
+ $str .= '<td><label for="'.$key.'">'.$value['name'].'</label></td>';
+ $str .= '<td><select name="'.$key.'" id="'.$key.'" '.$value['attrs'].' >'."\n";
for( $i = 0; $i < count($value['options']); ++$i) {
if( $i == $value['value'] ) $s = 'selected="selected"';
@@ -211,15 +215,16 @@
break;
case 'foldertypeselect':
$str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
$entries = array ( '' => _('Unspecified'), 'mail' => _('Mails'), 'task' => _('Tasks'),
'journal' => _('Journals'), 'event' => _('Events'),
'contact' => _('Contacts'), 'note' => _('Notes'));
if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><label>'.$value['name'].'</label></td>';
$str .= '<td><p class="ctrl">'.MySmarty::htmlentities($entries[$value['value']]).
'<input type="hidden" name="'.$key.'" value="'.MySmarty::htmlentities($value['value']).'" /></p></td>';
} else {
- $str .= '<td><select name="'.$key.'" '.$value['attrs'].' >'."\n";
+ $str .= '<td><label for="'.$key.'">'.$value['name'].'</label></td>';
+ $str .= '<td><select name="'.$key.'" id="'.$key.'" '.$value['attrs'].' >'."\n";
foreach ($entries as $id => $title) {
if ( $value['value'] == $id )
$s = 'selected="selected"';
@@ -236,11 +241,12 @@
break;
case 'aclselect': // Special Kolab entry for ACLs
$str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
+ $str .= '<td><label>'.$value['name'].'</label></td>';
if( $value['user'] ) $str .= '<td><span class="ctrl">'.MySmarty::htmlentities($value['user']).'</span> <span class="ctrl">'.$value['perm'].'</span></td>';
} else {
- $str .= '<td><input name="user_'.$key.'" type="text" size="'.($size-15).'" value="'
+ $str .= '<td><label for="user_'.$key.'">'.$value['name'].'</label></td>';
+ $str .= '<td><input name="user_'.$key.'" id="user_'.$key.'" type="'.$value['type'].'" size="'.($size-15).'" value="'
.MySmarty::htmlentities($value['user']).'" '.$value['attrs'].' />';
$str .= '<select name="perm_'.$key.'">'."\n";
if( $value['perm'] ) $selected_perm = $value['perm'];
@@ -269,7 +275,7 @@
debug("resourcepolicy");
$ro = ereg( 'readonly', $value['attrs'] );
$str .= '<tr>';
- $str .= '<td>'.$value['name'].'</td>';
+ $str .= '<td><label>'.$value['name'].'</label></td>';
$str .= '<td>';
$str .= '<table>';
$i = 0;
From cvs at kolab.org Thu May 24 12:17:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:17:27 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.118,1.119
Message-ID: <20070524101727.67BCC617E50@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8816
Modified Files:
release-notes.txt
Log Message:
Fixed kolab/issue1610 (https://intevation.de/roundup/kolab/issue1610)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- release-notes.txt 24 May 2007 10:03:51 -0000 1.118
+++ release-notes.txt 24 May 2007 10:17:25 -0000 1.119
@@ -42,6 +42,7 @@
- kolab-webadmin-2.1.0-2007????
+ kolab/issue1610 (Use <label> for forms in webadmin)
kolab/issue1618 (Add missing headings)
kolab/issue1619 (Add CSS file for printing)
kolab/issue1620 (fix invalid XHTML in form.class.php)
From cvs at kolab.org Thu May 24 12:17:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:17:27 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.41,1.42
Message-ID: <20070524101727.640CD617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv8816/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
Fixed kolab/issue1610 (https://intevation.de/roundup/kolab/issue1610)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ChangeLog 24 May 2007 10:03:51 -0000 1.41
+++ ChangeLog 24 May 2007 10:17:24 -0000 1.42
@@ -1,5 +1,10 @@
2007-05-24 Gunnar Wrobel <p at rdus.de>
+ * php/admin/include/form.class.php:
+
+ Fixed
+ kolab/issue1610 (https://intevation.de/roundup/kolab/issue1610)
+
* php/admin/templates/page.tpl.in:
* www/admin/print.css:
From cvs at kolab.org Thu May 24 12:20:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:20:28 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/templates
login.tpl, 1.1, 1.2
Message-ID: <20070524102028.3E56F617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates
In directory doto:/tmp/cvs-serv8948/kolab-webadmin/kolab-webadmin/php/admin/templates
Modified Files:
login.tpl
Log Message:
Fixed kolab/issue1615 (https://intevation.de/roundup/kolab/issue1615)
Index: login.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/login.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- login.tpl 11 Mar 2005 09:59:05 -0000 1.1
+++ login.tpl 24 May 2007 10:20:26 -0000 1.2
@@ -9,14 +9,14 @@
<form method="post">
<table>
<tr>
- <td>{tr msg="Username:"}</td><td><input type="text" name="username"/></td>
+ <td><label for="username">{tr msg="Username:"}</label></td><td><input type="text" name="username" id="username"/></td>
</tr>
<tr>
- <td>{tr msg="Password:"}</td><td><input type="password" name="password"/></td>
+ <td><label for="password">{tr msg="Password:"}</label></td><td><input type="password" name="password" id="password"/></td>
</tr>
<tr>
<td colspan="2" align="right"><input type="submit" name="login" value="{tr msg="Login"}"/></td>
</tr>
</table>
</form>
-</div>
\ No newline at end of file
+</div>
From cvs at kolab.org Thu May 24 12:20:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:20:28 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.119,1.120
Message-ID: <20070524102028.4C549617E51@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8948
Modified Files:
release-notes.txt
Log Message:
Fixed kolab/issue1615 (https://intevation.de/roundup/kolab/issue1615)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- release-notes.txt 24 May 2007 10:17:25 -0000 1.119
+++ release-notes.txt 24 May 2007 10:20:26 -0000 1.120
@@ -43,6 +43,7 @@
- kolab-webadmin-2.1.0-2007????
kolab/issue1610 (Use <label> for forms in webadmin)
+ kolab/issue1615 (Use <label> also for login page)
kolab/issue1618 (Add missing headings)
kolab/issue1619 (Add CSS file for printing)
kolab/issue1620 (fix invalid XHTML in form.class.php)
From cvs at kolab.org Thu May 24 12:20:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 12:20:28 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.42,1.43
Message-ID: <20070524102028.41B50617E50@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv8948/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
Fixed kolab/issue1615 (https://intevation.de/roundup/kolab/issue1615)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ChangeLog 24 May 2007 10:17:24 -0000 1.42
+++ ChangeLog 24 May 2007 10:20:26 -0000 1.43
@@ -1,5 +1,10 @@
2007-05-24 Gunnar Wrobel <p at rdus.de>
+ * php/admin/templates/login.tpl:
+
+ Fixed
+ kolab/issue1615 (https://intevation.de/roundup/kolab/issue1615)
+
* php/admin/include/form.class.php:
Fixed
From cvs at kolab.org Thu May 24 14:06:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:06:52 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin Makefile.am, 1.37,
1.38 ChangeLog, 1.43, 1.44
Message-ID: <20070524120652.4F1F360015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv11908/kolab-webadmin/kolab-webadmin
Modified Files:
Makefile.am ChangeLog
Log Message:
* Makefile.am (WSKOLAB_FILES):
Needed to add print.css to the files that should be installed.
kolab/issue1619 (https://intevation.de/roundup/kolab/issue1619)
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Makefile.am 10 Jan 2007 15:59:58 -0000 1.37
+++ Makefile.am 24 May 2007 12:06:50 -0000 1.38
@@ -16,6 +16,7 @@
WSKOLAB_FILES = www/admin/index.php \
www/admin/logout.php \
+ www/admin/print.css \
www/admin/style.css
wskolabdir = $(webserver_document_root)$(webserver_web_prefix)/admin
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ChangeLog 24 May 2007 10:20:26 -0000 1.43
+++ ChangeLog 24 May 2007 12:06:50 -0000 1.44
@@ -1,5 +1,10 @@
2007-05-24 Gunnar Wrobel <p at rdus.de>
+ * Makefile.am (WSKOLAB_FILES):
+
+ Needed to add print.css to the files that should be installed.
+ kolab/issue1619 (https://intevation.de/roundup/kolab/issue1619)
+
* php/admin/templates/login.tpl:
Fixed
From cvs at kolab.org Thu May 24 14:12:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:12:17 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin Makefile.am,1.38,1.39
Message-ID: <20070524121217.26BCA60015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv12024
Modified Files:
Makefile.am
Log Message:
Needed to add print.css to the files that should be installed.
kolab/issue1619 (https://intevation.de/roundup/kolab/issue1619)
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile.am 24 May 2007 12:06:50 -0000 1.38
+++ Makefile.am 24 May 2007 12:12:15 -0000 1.39
@@ -21,7 +21,8 @@
wskolabdir = $(webserver_document_root)$(webserver_web_prefix)/admin
wskolab_DATA = $(WSKOLAB_FILES)
-EXTRA_DIST += www/admin/style.css
+EXTRA_DIST += www/admin/style.css \
+ www/admin/print.css
WSADDRESSBOOK_FILES = www/admin/addressbook/addr.php \
www/admin/addressbook/index.php
From cvs at kolab.org Thu May 24 14:31:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:31:42 +0200 (CEST)
Subject: gunnar: server/PEAR-Archive_Tar - New directory
Message-ID: <20070524123142.66AE460015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv12476/PEAR-Archive_Tar
Log Message:
Directory /kolabrepository/server/PEAR-Archive_Tar added to the repository
From cvs at kolab.org Thu May 24 14:31:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:31:42 +0200 (CEST)
Subject: gunnar: server/PEAR-Auth_SASL - New directory
Message-ID: <20070524123142.7AFCD617E42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv12476/PEAR-Auth_SASL
Log Message:
Directory /kolabrepository/server/PEAR-Auth_SASL added to the repository
From cvs at kolab.org Thu May 24 14:31:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:31:42 +0200 (CEST)
Subject: gunnar: server/PEAR-Date - New directory
Message-ID: <20070524123142.81CD460015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Date
In directory doto:/tmp/cvs-serv12476/PEAR-Date
Log Message:
Directory /kolabrepository/server/PEAR-Date added to the repository
From cvs at kolab.org Thu May 24 14:31:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:31:42 +0200 (CEST)
Subject: gunnar: server/PEAR-Console_Getopt - New directory
Message-ID: <20070524123142.7F1D2617E4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv12476/PEAR-Console_Getopt
Log Message:
Directory /kolabrepository/server/PEAR-Console_Getopt added to the repository
From cvs at kolab.org Thu May 24 14:31:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:31:42 +0200 (CEST)
Subject: gunnar: server/PEAR-Log - New directory
Message-ID: <20070524123142.852DA617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Log
In directory doto:/tmp/cvs-serv12476/PEAR-Log
Log Message:
Directory /kolabrepository/server/PEAR-Log added to the repository
From cvs at kolab.org Thu May 24 14:31:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:31:42 +0200 (CEST)
Subject: gunnar: server/PEAR-Mail_Mime - New directory
Message-ID: <20070524123142.88F83617E54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv12476/PEAR-Mail_Mime
Log Message:
Directory /kolabrepository/server/PEAR-Mail_Mime added to the repository
From cvs at kolab.org Thu May 24 14:31:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:31:42 +0200 (CEST)
Subject: gunnar: server/PEAR-Mail - New directory
Message-ID: <20070524123142.85AFF617E53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Mail
In directory doto:/tmp/cvs-serv12476/PEAR-Mail
Log Message:
Directory /kolabrepository/server/PEAR-Mail added to the repository
From cvs at kolab.org Thu May 24 14:31:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:31:42 +0200 (CEST)
Subject: gunnar: server/PEAR-Net_Sieve - New directory
Message-ID: <20070524123142.C6A9660015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv12476/PEAR-Net_Sieve
Log Message:
Directory /kolabrepository/server/PEAR-Net_Sieve added to the repository
From cvs at kolab.org Thu May 24 14:31:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:31:43 +0200 (CEST)
Subject: gunnar: server/PEAR-Net_Socket - New directory
Message-ID: <20070524123143.1203660015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv12476/PEAR-Net_Socket
Log Message:
Directory /kolabrepository/server/PEAR-Net_Socket added to the repository
From cvs at kolab.org Thu May 24 14:31:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:31:43 +0200 (CEST)
Subject: gunnar: server/PEAR-PEAR - New directory
Message-ID: <20070524123143.517FF60015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-PEAR
In directory doto:/tmp/cvs-serv12476/PEAR-PEAR
Log Message:
Directory /kolabrepository/server/PEAR-PEAR added to the repository
From cvs at kolab.org Thu May 24 14:34:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:34:11 +0200 (CEST)
Subject: gunnar: server/PEAR-Net_Socket PEAR-Net_Socket.spec, NONE,
1.1 Makefile, NONE, 1.1
Message-ID: <20070524123411.C4428617E42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv12659/PEAR-Net_Socket
Added Files:
PEAR-Net_Socket.spec Makefile
Log Message:
* PEAR-*/*:
Added PEAR-* packages in preparation of getting the newest
Horde into Kolab CVS.
--- NEW FILE: PEAR-Net_Socket.spec ---
# Defines
%define package_name Net_Socket
# Package Information
Name: PEAR-%{package_name}
Summary: PEAR: Network Socket Interface
URL: http://pear.php.net/package/%{package_name}
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: 1.0.6
Release: 1
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: PEAR-PEAR >= 1.4.7
PreReq: PEAR-Net_Socket >= 1.0, PEAR-PEAR >= 1.4.7
%description
Net_Socket is a class interface to TCP sockets. It provides blocking
and non-blocking operation, with different reading and writing modes
(byte-wise, block-wise, line-wise and special formats like network
byte-order ip addresses).
%prep
%setup -n %{package_name}-%{version}
%build
%install
rm -rf $RPM_BUILD_ROOT
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
PNAME= Net_Socket
VERSION = 1.0.6
NAME = PEAR-$(PNAME)
PACKAGE = PEAR-$(PNAME)
RELEASE = 1
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 14:34:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:34:11 +0200 (CEST)
Subject: gunnar: server/PEAR-PEAR PEAR-PEAR.spec,NONE,1.1 Makefile,NONE,1.1
Message-ID: <20070524123411.C0FC560015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-PEAR
In directory doto:/tmp/cvs-serv12659/PEAR-PEAR
Added Files:
PEAR-PEAR.spec Makefile
Log Message:
* PEAR-*/*:
Added PEAR-* packages in preparation of getting the newest
Horde into Kolab CVS.
--- NEW FILE: PEAR-PEAR.spec ---
# Package Information
Name: PEAR-PEAR
Summary: PEAR: PEAR Base System
URL: http://pear.php.net/package/PEAR
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: 1.4.11
Release: 1
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
Source: http://pear.php.net/get/PEAR-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: PEAR-Archive_Tar >= 1.3.2, php
PreReq: PEAR-Archive_Tar >= 1.3.2, php
%description
The PEAR package contains:
* the PEAR installer, for creating, distributing
and installing packages
* the beta-quality PEAR_Exception PHP5 error handling mechanism
* the beta-quality PEAR_ErrorStack advanced error handling mechanism
* the PEAR_Error error handling mechanism
* the OS_Guess class for retrieving info about the OS
where PHP is running on
* the System class for quick handling of common operations
with files and directories
* the PEAR base class
New features in a nutshell:
* full support for channels
* pre-download dependency validation
* new package.xml 2.0 format allows tremendous flexibility while maintaining BC
* support for optional dependency groups and limited support for sub-packaging
* robust dependency support
* full dependency validation on uninstall
* remote install for hosts with only ftp access - no more problems with
restricted host installation
* full support for mirroring
* support for bundling several packages into a single tarball
* support for static dependencies on a url-based package
* support for custom file roles and installation tasks
NOTE: users of PEAR_Frontend_Web/PEAR_Frontend_Gtk must upgrade their installations
to the latest version, or PEAR will not upgrade properly
%prep
%setup -n PEAR-%{version}
%build
%install
rm -rf $RPM_BUILD_ROOT
PEAR_VERSION=`%{l_prefix}/bin/pear version 2>&1 | grep PEAR | sed -e 's/PEAR Version: \([0-9\.]*\).*/\1/'`
if [ $PEAR_VERSION == "1.4.11" ]; then
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/PEAR-%{version}.tgz
else
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/PEAR-%{version}.tgz
fi
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
NAME = PEAR-PEAR
PACKAGE = PEAR-PEAR
VERSION = 1.4.11
RELEASE = 1
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
SOURCE_0=http://pear.php.net/get/PEAR-$(VERSION).tgz
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 14:34:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:34:11 +0200 (CEST)
Subject: gunnar: server/PEAR-Net_Sieve PEAR-Net_Sieve.spec, NONE, 1.1 Makefile,
NONE, 1.1
Message-ID: <20070524123411.C91E9617E4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv12659/PEAR-Net_Sieve
Added Files:
PEAR-Net_Sieve.spec Makefile
Log Message:
* PEAR-*/*:
Added PEAR-* packages in preparation of getting the newest
Horde into Kolab CVS.
--- NEW FILE: PEAR-Net_Sieve.spec ---
# Defines
%define package_name Net_Sieve
# Package Information
Name: PEAR-%{package_name}
Summary: PEAR: Handles talking to timsieved
URL: http://pear.php.net/package/%{package_name}
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: 1.1.5
Release: 1
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: PEAR-PEAR >= 1.4.7
PreReq: PEAR-Net_Socket >= 1.0, PEAR-PEAR >= 1.4.7
%description
Provides an API to talk to the timsieved server that comes
with Cyrus IMAPd. Can be used to install, remove, mark active etc
sieve scripts.
%prep
%setup -n %{package_name}-%{version}
%build
%install
rm -rf $RPM_BUILD_ROOT
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
PNAME= Net_Sieve
VERSION = 1.1.5
NAME = PEAR-$(PNAME)
PACKAGE = PEAR-$(PNAME)
RELEASE = 1
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 14:34:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:34:11 +0200 (CEST)
Subject: gunnar: server/PEAR-Mail_Mime PEAR-Mail_Mime.spec, NONE, 1.1 Makefile,
NONE, 1.1
Message-ID: <20070524123411.CC14C617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv12659/PEAR-Mail_Mime
Added Files:
PEAR-Mail_Mime.spec Makefile
Log Message:
* PEAR-*/*:
Added PEAR-* packages in preparation of getting the newest
Horde into Kolab CVS.
--- NEW FILE: PEAR-Mail_Mime.spec ---
# Defines
%define package_name Mail_Mime
# Package Information
Name: PEAR-%{package_name}
Summary: PEAR: Provides classes to create and decode mime messages.
URL: http://pear.php.net/package/%{package_name}
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: 1.3.1
Release: 1
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: PEAR-PEAR >= 1.4.7
PreReq: PEAR-PEAR >= 1.4.7
%description
Provides classes to deal with creation and manipulation of mime messages.
%prep
%setup -n %{package_name}-%{version}
%build
%install
rm -rf $RPM_BUILD_ROOT
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
PNAME= Mail_Mime
VERSION = 1.3.1
NAME = PEAR-$(PNAME)
PACKAGE = PEAR-$(PNAME)
RELEASE = 1
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 14:34:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:34:11 +0200 (CEST)
Subject: gunnar: server/PEAR-Mail PEAR-Mail.spec,NONE,1.1 Makefile,NONE,1.1
Message-ID: <20070524123411.D0978617E53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Mail
In directory doto:/tmp/cvs-serv12659/PEAR-Mail
Added Files:
PEAR-Mail.spec Makefile
Log Message:
* PEAR-*/*:
Added PEAR-* packages in preparation of getting the newest
Horde into Kolab CVS.
--- NEW FILE: PEAR-Mail.spec ---
# Defines
%define package_name Mail
# Package Information
Name: PEAR-%{package_name}
Summary: PEAR: Class that provides multiple interfaces for sending emails
URL: http://pear.php.net/package/%{package_name}
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: 1.1.14
Release: 1
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: PEAR-PEAR >= 1.4.7
PreReq: PEAR-PEAR >= 1.4.7
%description
PEAR's Mail package defines an interface for implementing mailers under the
PEAR hierarchy. It also provides supporting functions useful to multiple
mailer backends. Currently supported backends include: PHP's native
mail() function, sendmail, and SMTP. This package also provides a RFC822
email address list validation utility class.
%prep
%setup -n %{package_name}-%{version}
%build
%install
rm -rf $RPM_BUILD_ROOT
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
NAME = PEAR-Mail
PACKAGE = PEAR-Mail
VERSION = 1.1.14
RELEASE = 1
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
SOURCE_0=http://pear.php.net/get/Mail-$(VERSION).tgz
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 14:34:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:34:11 +0200 (CEST)
Subject: gunnar: server/PEAR-Log PEAR-Log.spec,NONE,1.1 Makefile,NONE,1.1
Message-ID: <20070524123411.D9321617E54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Log
In directory doto:/tmp/cvs-serv12659/PEAR-Log
Added Files:
PEAR-Log.spec Makefile
Log Message:
* PEAR-*/*:
Added PEAR-* packages in preparation of getting the newest
Horde into Kolab CVS.
--- NEW FILE: PEAR-Log.spec ---
# Defines
%define package_name Log
# Package Information
Name: PEAR-%{package_name}
Summary: PEAR: Logging utilities
URL: http://pear.php.net/package/%{package_name}
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: 1.9.9
Release: 1
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: PEAR-PEAR >= 1.4.7
PreReq: PEAR-PEAR >= 1.4.7
%description
The Log framework provides an abstracted logging system. It supports
logging to console, file, syslog, SQL, Sqlite, mail, and mcal targets. It
also provides a subject - observer mechanism.
%prep
%setup -n %{package_name}-%{version}
%build
%install
rm -rf $RPM_BUILD_ROOT
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
NAME = PEAR-Log
PACKAGE = PEAR-Log
VERSION = 1.9.9
RELEASE = 1
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
SOURCE_0=http://pear.php.net/get/Log-$(VERSION).tgz
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 14:34:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:34:12 +0200 (CEST)
Subject: gunnar: server/PEAR-Date PEAR-Date.spec,NONE,1.1 Makefile,NONE,1.1
Message-ID: <20070524123412.1A10160015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Date
In directory doto:/tmp/cvs-serv12659/PEAR-Date
Added Files:
PEAR-Date.spec Makefile
Log Message:
* PEAR-*/*:
Added PEAR-* packages in preparation of getting the newest
Horde into Kolab CVS.
--- NEW FILE: PEAR-Date.spec ---
# Defines
%define package_name Date
# Package Information
Name: PEAR-%{package_name}
Summary: PEAR: Generic date/time handling class for PEAR
URL: http://pear.php.net/package/%{package_name}
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: 1.4.7
Release: 1
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: PEAR-PEAR >= 1.4.7
PreReq: PEAR-PEAR >= 1.4.7
%description
Generic classes for representation and manipulation of
dates, times and time zones without the need of timestamps,
which is a huge limitation for php programs. Includes time zone data,
time zone conversions and many date/time conversions.
It does not rely on 32-bit system date stamps, so
you can display calendars and compare dates that date
pre 1970 and post 2038. This package also provides a class
to convert date strings between Gregorian and Human calendar formats.
%prep
%setup -n %{package_name}-%{version}
%build
%install
rm -rf $RPM_BUILD_ROOT
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
PNAME= Date
VERSION = 1.4.7
NAME = PEAR-$(PNAME)
PACKAGE = PEAR-$(PNAME)
RELEASE = 1
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 14:34:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:34:12 +0200 (CEST)
Subject: gunnar: server/PEAR-Console_Getopt PEAR-Console_Getopt.spec, NONE,
1.1 Makefile, NONE, 1.1
Message-ID: <20070524123412.6F9BF60015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv12659/PEAR-Console_Getopt
Added Files:
PEAR-Console_Getopt.spec Makefile
Log Message:
* PEAR-*/*:
Added PEAR-* packages in preparation of getting the newest
Horde into Kolab CVS.
--- NEW FILE: PEAR-Console_Getopt.spec ---
# Package Information
Name: PEAR-Console_Getopt
Summary: PEAR: Command-line option parser
URL: http://pear.php.net/package/PEAR
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: 1.2.1
Release: 1
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
Source: http://pear.php.net/get/Console_Getopt-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
%description
This is a PHP implementation of "getopt" supporting both
short and long options.
%prep
%setup -n Console_Getopt-%{version}
%build
%install
rm -rf $RPM_BUILD_ROOT
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Console_Getopt-%{version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
NAME = PEAR-Console_Getopt
PACKAGE = PEAR-Console_Getopt
VERSION = 1.2.1
RELEASE = 1
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
SOURCE_0=http://pear.php.net/get/Console_Getopt-$(VERSION).tgz
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 14:34:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:34:12 +0200 (CEST)
Subject: gunnar: server/PEAR-Archive_Tar PEAR-Archive_Tar.spec, NONE,
1.1 Makefile, NONE, 1.1
Message-ID: <20070524123412.74801617E4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv12659/PEAR-Archive_Tar
Added Files:
PEAR-Archive_Tar.spec Makefile
Log Message:
* PEAR-*/*:
Added PEAR-* packages in preparation of getting the newest
Horde into Kolab CVS.
--- NEW FILE: PEAR-Archive_Tar.spec ---
# Package Information
Name: PEAR-Archive_Tar
Summary: PEAR: Tar file management class
URL: http://pear.php.net/package/PEAR
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: 1.3.2
Release: 1
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
Source: http://pear.php.net/get/Archive_Tar-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
%description
This class provides handling of tar files in PHP.
It supports creating, listing, extracting and adding to tar files.
Gzip support is available if PHP has the zlib extension built-in or
loaded. Bz2 compression is also supported with the bz2 extension loaded.
%prep
%setup -n Archive_Tar-%{version}
%build
%install
rm -rf $RPM_BUILD_ROOT
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Archive_Tar-%{version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
NAME = PEAR-Archive_Tar
PACKAGE = PEAR-Archive_Tar
VERSION = 1.3.2
RELEASE = 1
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
SOURCE_0=http://pear.php.net/get/Archive_Tar-$(VERSION).tgz
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 14:34:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 14:34:12 +0200 (CEST)
Subject: gunnar: server/PEAR-Auth_SASL PEAR-Auth_SASL.spec, NONE, 1.1 Makefile,
NONE, 1.1
Message-ID: <20070524123412.71FB5617E42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv12659/PEAR-Auth_SASL
Added Files:
PEAR-Auth_SASL.spec Makefile
Log Message:
* PEAR-*/*:
Added PEAR-* packages in preparation of getting the newest
Horde into Kolab CVS.
--- NEW FILE: PEAR-Auth_SASL.spec ---
# Defines
%define package_name Auth_SASL
# Package Information
Name: PEAR-%{package_name}
Summary: PEAR: Abstraction of various SASL mechanism responses
URL: http://pear.php.net/package/%{package_name}
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: 1.0.2
Release: 1
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: PEAR-PEAR >= 1.4.7
PreReq: PEAR-PEAR >= 1.4.7
%description
Provides code to generate responses to common SASL mechanisms, including:
o Digest-MD5
o CramMD5
o Plain
o Anonymous
o Login (Pseudo mechanism)
%prep
%setup -n %{package_name}-%{version}
%build
%install
rm -rf $RPM_BUILD_ROOT
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
PNAME= Auth_SASL
VERSION = 1.0.2
NAME = PEAR-$(PNAME)
PACKAGE = PEAR-$(PNAME)
RELEASE = 1
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:42:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:42:34 +0200 (CEST)
Subject: gunnar: server/PEAR-Mail Makefile,1.1,1.2
Message-ID: <20070524144234.A9FF0617E5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Mail
In directory doto:/tmp/cvs-serv15212/PEAR-Mail
Modified Files:
Makefile
Log Message:
Add dist targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/PEAR-Mail/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 24 May 2007 12:34:09 -0000 1.1
+++ Makefile 24 May 2007 14:42:32 -0000 1.2
@@ -19,5 +19,8 @@
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:42:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:42:34 +0200 (CEST)
Subject: gunnar: server/PEAR-Archive_Tar Makefile,1.1,1.2
Message-ID: <20070524144234.F00F1617E5C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv15212/PEAR-Archive_Tar
Modified Files:
Makefile
Log Message:
Add dist targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/PEAR-Archive_Tar/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 24 May 2007 12:34:10 -0000 1.1
+++ Makefile 24 May 2007 14:42:32 -0000 1.2
@@ -19,5 +19,8 @@
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:42:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:42:34 +0200 (CEST)
Subject: gunnar: server/PEAR-Log Makefile,1.1,1.2
Message-ID: <20070524144234.A6CDB617E59@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Log
In directory doto:/tmp/cvs-serv15212/PEAR-Log
Modified Files:
Makefile
Log Message:
Add dist targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/PEAR-Log/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 24 May 2007 12:34:09 -0000 1.1
+++ Makefile 24 May 2007 14:42:32 -0000 1.2
@@ -19,5 +19,8 @@
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:42:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:42:35 +0200 (CEST)
Subject: gunnar: server/PEAR-Auth_SASL Makefile,1.1,1.2
Message-ID: <20070524144235.3B72B617E5D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv15212/PEAR-Auth_SASL
Modified Files:
Makefile
Log Message:
Add dist targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/PEAR-Auth_SASL/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 24 May 2007 12:34:10 -0000 1.1
+++ Makefile 24 May 2007 14:42:32 -0000 1.2
@@ -20,5 +20,8 @@
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:42:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:42:34 +0200 (CEST)
Subject: gunnar: server/PEAR-Mail_Mime Makefile,1.1,1.2
Message-ID: <20070524144234.EB394617E5B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv15212/PEAR-Mail_Mime
Modified Files:
Makefile
Log Message:
Add dist targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/PEAR-Mail_Mime/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 24 May 2007 12:34:09 -0000 1.1
+++ Makefile 24 May 2007 14:42:32 -0000 1.2
@@ -20,5 +20,8 @@
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:42:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:42:35 +0200 (CEST)
Subject: gunnar: server/PEAR-Date Makefile,1.1,1.2
Message-ID: <20070524144235.3FC51617E5F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Date
In directory doto:/tmp/cvs-serv15212/PEAR-Date
Modified Files:
Makefile
Log Message:
Add dist targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/PEAR-Date/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 24 May 2007 12:34:09 -0000 1.1
+++ Makefile 24 May 2007 14:42:32 -0000 1.2
@@ -20,5 +20,8 @@
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:42:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:42:35 +0200 (CEST)
Subject: gunnar: server/PEAR-Net_Sieve Makefile,1.1,1.2
Message-ID: <20070524144235.40B6C617E60@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv15212/PEAR-Net_Sieve
Modified Files:
Makefile
Log Message:
Add dist targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/PEAR-Net_Sieve/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 24 May 2007 12:34:09 -0000 1.1
+++ Makefile 24 May 2007 14:42:32 -0000 1.2
@@ -20,5 +20,8 @@
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:42:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:42:35 +0200 (CEST)
Subject: gunnar: server/PEAR-PEAR Makefile,1.1,1.2
Message-ID: <20070524144235.437B0617E62@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-PEAR
In directory doto:/tmp/cvs-serv15212/PEAR-PEAR
Modified Files:
Makefile
Log Message:
Add dist targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/PEAR-PEAR/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 24 May 2007 12:34:09 -0000 1.1
+++ Makefile 24 May 2007 14:42:32 -0000 1.2
@@ -19,5 +19,8 @@
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:42:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:42:35 +0200 (CEST)
Subject: gunnar: server/PEAR-Net_Socket Makefile,1.1,1.2
Message-ID: <20070524144235.4343C617E61@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv15212/PEAR-Net_Socket
Modified Files:
Makefile
Log Message:
Add dist targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/PEAR-Net_Socket/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 24 May 2007 12:34:09 -0000 1.1
+++ Makefile 24 May 2007 14:42:32 -0000 1.2
@@ -20,5 +20,8 @@
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:42:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:42:35 +0200 (CEST)
Subject: gunnar: server/PEAR-Console_Getopt Makefile,1.1,1.2
Message-ID: <20070524144235.3EC1C617E5E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv15212/PEAR-Console_Getopt
Modified Files:
Makefile
Log Message:
Add dist targets.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/PEAR-Console_Getopt/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 24 May 2007 12:34:10 -0000 1.1
+++ Makefile 24 May 2007 14:42:32 -0000 1.2
@@ -19,5 +19,8 @@
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+dist: all
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu May 24 16:49:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:49:41 +0200 (CEST)
Subject: gunnar: server/PEAR-Archive_Tar PEAR-Archive_Tar.spec,1.1,1.2
Message-ID: <20070524144941.1BCDA617E5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv15417/PEAR-Archive_Tar
Modified Files:
PEAR-Archive_Tar.spec
Log Message:
Remove problematic rpm command as pointed out by Marcus Hüwe.
Index: PEAR-Archive_Tar.spec
===================================================================
RCS file: /kolabrepository/server/PEAR-Archive_Tar/PEAR-Archive_Tar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Archive_Tar.spec 24 May 2007 12:34:10 -0000 1.1
+++ PEAR-Archive_Tar.spec 24 May 2007 14:49:39 -0000 1.2
@@ -28,8 +28,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Archive_Tar-%{version}.tgz
From cvs at kolab.org Thu May 24 16:49:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:49:41 +0200 (CEST)
Subject: gunnar: server/PEAR-Console_Getopt PEAR-Console_Getopt.spec,1.1,1.2
Message-ID: <20070524144941.28EC4617E5E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv15417/PEAR-Console_Getopt
Modified Files:
PEAR-Console_Getopt.spec
Log Message:
Remove problematic rpm command as pointed out by Marcus Hüwe.
Index: PEAR-Console_Getopt.spec
===================================================================
RCS file: /kolabrepository/server/PEAR-Console_Getopt/PEAR-Console_Getopt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Console_Getopt.spec 24 May 2007 12:34:10 -0000 1.1
+++ PEAR-Console_Getopt.spec 24 May 2007 14:49:39 -0000 1.2
@@ -26,8 +26,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Console_Getopt-%{version}.tgz
From cvs at kolab.org Thu May 24 16:49:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:49:41 +0200 (CEST)
Subject: gunnar: server/PEAR-Auth_SASL PEAR-Auth_SASL.spec,1.1,1.2
Message-ID: <20070524144941.2051F617E5C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv15417/PEAR-Auth_SASL
Modified Files:
PEAR-Auth_SASL.spec
Log Message:
Remove problematic rpm command as pointed out by Marcus Hüwe.
Index: PEAR-Auth_SASL.spec
===================================================================
RCS file: /kolabrepository/server/PEAR-Auth_SASL/PEAR-Auth_SASL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Auth_SASL.spec 24 May 2007 12:34:10 -0000 1.1
+++ PEAR-Auth_SASL.spec 24 May 2007 14:49:39 -0000 1.2
@@ -35,8 +35,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
From cvs at kolab.org Thu May 24 16:49:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:49:41 +0200 (CEST)
Subject: gunnar: server/PEAR-Date PEAR-Date.spec,1.1,1.2
Message-ID: <20070524144941.2CF48617E5F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Date
In directory doto:/tmp/cvs-serv15417/PEAR-Date
Modified Files:
PEAR-Date.spec
Log Message:
Remove problematic rpm command as pointed out by Marcus Hüwe.
Index: PEAR-Date.spec
===================================================================
RCS file: /kolabrepository/server/PEAR-Date/PEAR-Date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Date.spec 24 May 2007 12:34:09 -0000 1.1
+++ PEAR-Date.spec 24 May 2007 14:49:39 -0000 1.2
@@ -37,8 +37,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
From cvs at kolab.org Thu May 24 16:49:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:49:41 +0200 (CEST)
Subject: gunnar: server/PEAR-Log PEAR-Log.spec,1.1,1.2
Message-ID: <20070524144941.6D1EC617E5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Log
In directory doto:/tmp/cvs-serv15417/PEAR-Log
Modified Files:
PEAR-Log.spec
Log Message:
Remove problematic rpm command as pointed out by Marcus Hüwe.
Index: PEAR-Log.spec
===================================================================
RCS file: /kolabrepository/server/PEAR-Log/PEAR-Log.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Log.spec 24 May 2007 12:34:09 -0000 1.1
+++ PEAR-Log.spec 24 May 2007 14:49:39 -0000 1.2
@@ -32,8 +32,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
From cvs at kolab.org Thu May 24 16:49:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:49:41 +0200 (CEST)
Subject: gunnar: server/PEAR-Mail_Mime PEAR-Mail_Mime.spec,1.1,1.2
Message-ID: <20070524144941.6F86A617E5C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv15417/PEAR-Mail_Mime
Modified Files:
PEAR-Mail_Mime.spec
Log Message:
Remove problematic rpm command as pointed out by Marcus Hüwe.
Index: PEAR-Mail_Mime.spec
===================================================================
RCS file: /kolabrepository/server/PEAR-Mail_Mime/PEAR-Mail_Mime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Mail_Mime.spec 24 May 2007 12:34:09 -0000 1.1
+++ PEAR-Mail_Mime.spec 24 May 2007 14:49:39 -0000 1.2
@@ -30,8 +30,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
From cvs at kolab.org Thu May 24 16:49:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:49:41 +0200 (CEST)
Subject: gunnar: server/PEAR-Mail PEAR-Mail.spec,1.1,1.2
Message-ID: <20070524144941.B1834617E5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Mail
In directory doto:/tmp/cvs-serv15417/PEAR-Mail
Modified Files:
PEAR-Mail.spec
Log Message:
Remove problematic rpm command as pointed out by Marcus Hüwe.
Index: PEAR-Mail.spec
===================================================================
RCS file: /kolabrepository/server/PEAR-Mail/PEAR-Mail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Mail.spec 24 May 2007 12:34:09 -0000 1.1
+++ PEAR-Mail.spec 24 May 2007 14:49:39 -0000 1.2
@@ -34,8 +34,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
From cvs at kolab.org Thu May 24 16:49:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:49:41 +0200 (CEST)
Subject: gunnar: server/PEAR-Net_Sieve PEAR-Net_Sieve.spec,1.1,1.2
Message-ID: <20070524144941.B3E47617E5C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv15417/PEAR-Net_Sieve
Modified Files:
PEAR-Net_Sieve.spec
Log Message:
Remove problematic rpm command as pointed out by Marcus Hüwe.
Index: PEAR-Net_Sieve.spec
===================================================================
RCS file: /kolabrepository/server/PEAR-Net_Sieve/PEAR-Net_Sieve.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Net_Sieve.spec 24 May 2007 12:34:09 -0000 1.1
+++ PEAR-Net_Sieve.spec 24 May 2007 14:49:39 -0000 1.2
@@ -32,8 +32,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
From cvs at kolab.org Thu May 24 16:49:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:49:42 +0200 (CEST)
Subject: gunnar: server/PEAR-Net_Socket PEAR-Net_Socket.spec,1.1,1.2
Message-ID: <20070524144942.0DF90617E5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv15417/PEAR-Net_Socket
Modified Files:
PEAR-Net_Socket.spec
Log Message:
Remove problematic rpm command as pointed out by Marcus Hüwe.
Index: PEAR-Net_Socket.spec
===================================================================
RCS file: /kolabrepository/server/PEAR-Net_Socket/PEAR-Net_Socket.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-Net_Socket.spec 24 May 2007 12:34:09 -0000 1.1
+++ PEAR-Net_Socket.spec 24 May 2007 14:49:39 -0000 1.2
@@ -34,8 +34,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
From cvs at kolab.org Thu May 24 16:49:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 24 May 2007 16:49:42 +0200 (CEST)
Subject: gunnar: server/PEAR-PEAR PEAR-PEAR.spec,1.1,1.2
Message-ID: <20070524144942.10598617E5C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-PEAR
In directory doto:/tmp/cvs-serv15417/PEAR-PEAR
Modified Files:
PEAR-PEAR.spec
Log Message:
Remove problematic rpm command as pointed out by Marcus Hüwe.
Index: PEAR-PEAR.spec
===================================================================
RCS file: /kolabrepository/server/PEAR-PEAR/PEAR-PEAR.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PEAR-PEAR.spec 24 May 2007 12:34:09 -0000 1.1
+++ PEAR-PEAR.spec 24 May 2007 14:49:40 -0000 1.2
@@ -54,8 +54,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
PEAR_VERSION=`%{l_prefix}/bin/pear version 2>&1 | grep PEAR | sed -e 's/PEAR Version: \([0-9\.]*\).*/\1/'`
if [ $PEAR_VERSION == "1.4.11" ]; then
From cvs at kolab.org Fri May 25 10:26:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 10:26:07 +0200 (CEST)
Subject: gunnar: server/horde-framework - New directory
Message-ID: <20070525082607.D7D4E60015B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-framework
In directory doto:/tmp/cvs-serv12853/horde-framework
Log Message:
Directory /kolabrepository/server/horde-framework added to the repository
From cvs at kolab.org Fri May 25 11:11:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 11:11:14 +0200 (CEST)
Subject: gunnar: server/horde-framework Makefile, NONE,
1.1 Prefs-Prefs-kolab.php.patch, NONE,
1.1 horde-framework-kolab.spec, NONE, 1.1
Message-ID: <20070525091114.72768617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-framework
In directory doto:/tmp/cvs-serv13956
Added Files:
Makefile Prefs-Prefs-kolab.php.patch
horde-framework-kolab.spec
Log Message:
A first draft version of a snapshot based horde framework package.
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
HORDE_NAME = $(shell grep "%define.*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define.*V_year" *.spec | sed -e "s/.*V_year \([a-z-]*\).*/\1/")
MONTH = $(shell grep "%define.*V_month" *.spec | sed -e "s/.*V_month \([a-z-]*\).*/\1/")
DAY = $(shell grep "%define.*V_day" *.spec | sed -e "s/.*V_day \([a-z-]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = ${YEAR}${MONTH}${DAY}
RELEASE = $(shell grep "%define.*V_release" *.spec | sed -e "s/.*V_release \([0-9]*\).*/\1/")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
if [ -n "$(TEMPLATES)" ]; then \
for TEMPLATE in $(TEMPLATES); \
do \
cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(CONFIGS)" ]; then \
for CONFIG in $(CONFIGS); \
do \
cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE); \
done; \
fi
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
--- NEW FILE: Prefs-Prefs-kolab.php.patch ---
Index: Prefs/Prefs/kolab.php
===================================================================
RCS file: /repository/framework/Prefs/Prefs/kolab.php,v
retrieving revision 1.13
diff -u -B -r1.13 kolab.php
--- Prefs/Prefs/kolab.php 10 Oct 2006 09:05:19 -0000 1.13
+++ Prefs/Prefs/kolab.php 24 May 2007 16:01:38 -0000
@@ -1,5 +1,6 @@
<?php
+require_once 'Horde/Auth.php';
require_once 'Horde/Prefs/ldap.php';
require_once 'Horde/Kolab.php';
@@ -38,6 +39,8 @@
'version' => '3',
'basedn' => $GLOBALS['conf']['kolab']['ldap']['basedn'],
'fetchdn' => true,
+ 'username' => Auth::getAuth(),
+ 'password' => Auth::getCredential('password'),
'searchdn' => $GLOBALS['conf']['kolab']['ldap']['phpdn'],
'searchpass' => $GLOBALS['conf']['kolab']['ldap']['phppw'],
'uid' => array('mail', 'uid'));
--- NEW FILE: horde-framework-kolab.spec ---
# Versions
%define V_horde_name framework
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
%define V_day 24
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
# Package Information
Name: %{V_package}
Summary: The Horde Framework is the glue that all Horde applications have in common.
URL: http://www.horde.org/
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: %{V_version}
Release: %{V_release}
License: LGPL
Group: Languages
Distribution: OpenPKG
# List of Sources
Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
##################################################
# PATCH COMMENT
#
# Necessary to allow Ingo store the filters
# based on the preference driver. Ingo needs
# to get fixed to be able to remove this patch.
Patch0: Prefs-Prefs-kolab.php.patch
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: PEAR-PEAR >= 1.4.0
PreReq: apache >= 1.2.29
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
%description
The Horde Application Framework is a general-purpose web
application framework in PHP, providing classes for dealing with
preferences, compression, browser detection, connection tracking, MIME
handling, and more.
%prep
%setup -n framework
%patch -p0 -P 0
%build
%install
# Hack to add the necessary horde channel
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off" \
%{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php channel-discover pear.horde.org && \
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off" \
%{l_prefix}/bin/pear -d php_dir=%{l_prefix}/lib/php channel-update pear.horde.org || \
echo "Channel already exists!" && sleep 1
#BAD, BAD hack
rm -rf %{l_prefix}/.pearrc
for PKG in **/package.xml; do \
if [ "$PKG" != "Rampage/package.xml" -a "$PKG" != "devtools/package.xml" -a "$PKG" != "Lens/package.xml" ]; then \
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/kolab/RPM/TMP/pear/cache" \
%{l_prefix}/bin/pear package $PKG; \
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/kolab/RPM/TMP/tmp/pear/cache" \
%{l_prefix}/bin/pear install --force --loose --nodeps --offline --packagingroot="$RPM_BUILD_ROOT" *.tgz;\
rm *.tgz; \
fi; \
done
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
From cvs at kolab.org Fri May 25 11:25:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 11:25:22 +0200 (CEST)
Subject: gunnar: server/horde-framework Makefile, 1.1,
1.2 horde-framework-kolab.spec, 1.1, 1.2
Message-ID: <20070525092522.E46F5617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-framework
In directory doto:/tmp/cvs-serv14244
Modified Files:
Makefile horde-framework-kolab.spec
Log Message:
Fixed the draft version of the horde-framework package definition. This should build.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde-framework/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 25 May 2007 09:11:12 -0000 1.1
+++ Makefile 25 May 2007 09:25:20 -0000 1.2
@@ -1,14 +1,14 @@
RPM = /kolab/bin/openpkg rpm
-HORDE_NAME = $(shell grep "%define.*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
-YEAR = $(shell grep "%define.*V_year" *.spec | sed -e "s/.*V_year \([a-z-]*\).*/\1/")
-MONTH = $(shell grep "%define.*V_month" *.spec | sed -e "s/.*V_month \([a-z-]*\).*/\1/")
-DAY = $(shell grep "%define.*V_day" *.spec | sed -e "s/.*V_day \([a-z-]*\).*/\1/")
+HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
+YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
+MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
+DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = ${YEAR}${MONTH}${DAY}
-RELEASE = $(shell grep "%define.*V_release" *.spec | sed -e "s/.*V_release \([0-9]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
@@ -25,6 +25,7 @@
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
+ cp *.patch $(KOLABRPMSRC)/$(PACKAGE)
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
if [ -n "$(TEMPLATES)" ]; then \
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-framework-kolab.spec 25 May 2007 09:11:12 -0000 1.1
+++ horde-framework-kolab.spec 25 May 2007 09:25:20 -0000 1.2
@@ -63,7 +63,7 @@
rm -rf %{l_prefix}/.pearrc
for PKG in **/package.xml; do \
- if [ "$PKG" != "Rampage/package.xml" -a "$PKG" != "devtools/package.xml" -a "$PKG" != "Lens/package.xml" ]; then \
+ if [ "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" ]; then \
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/kolab/RPM/TMP/pear/cache" \
%{l_prefix}/bin/pear package $PKG; \
From cvs at kolab.org Fri May 25 11:35:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 11:35:50 +0200 (CEST)
Subject: gunnar: server/horde CHANGELOG, 1.1, NONE Kolab.php, 1.1,
NONE Makefile, 1.7, NONE String.php, 1.1, NONE horde.spec, 1.7,
NONE horde_horde.php, 1.2, NONE horde_html.php, 1.1,
NONE horde_mime_drivers.php, 1.1, NONE horde_mime_mapping.php,
1.1, NONE horde_registry.php, 1.4, NONE iCalendar.php, 1.1,
NONE imp_conf.php, 1.2, NONE imp_html.php, 1.1,
NONE imp_mime_drivers.php, 1.1, NONE imp_prefs.php, 1.1,
NONE imp_servers.php, 1.5, NONE kronolith_conf.php, 1.2,
NONE kronolith_html.php, 1.1, NONE kronolith_kolab.php, 1.1,
NONE kronolith_prefs.php, 1.1, NONE mnemo_conf.php, 1.2,
NONE mnemo_kolab.php, 1.1, NONE mnemo_menu.php, 1.1,
NONE mnemo_prefs.php, 1.1, NONE nag_conf.php, 1.2,
NONE nag_html.php, 1.1, NONE nag_kolab.php, 1.1,
NONE nag_prefs.php, 1.1, NONE turba_attributes.php, 1.2,
NONE turba_conf.php, 1.1, NONE turba_html.php, 1.1,
NONE turba_kolab.php, 1.1, NONE turba_prefs.php, 1.1,
NONE turba_sources.php, 1.3, NONE valarm.php, 1.1,
NONE vevent.php, 1.1, NONE vfreebusy.php, 1.1, NONE vjournal.php,
1.1, NONE vtimezone.php, 1.1, NONE vtodo.php, 1.1 ,NONE
Message-ID: <20070525093550.E7395617E70@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde
In directory doto:/tmp/cvs-serv14642
Removed Files:
CHANGELOG Kolab.php Makefile String.php horde.spec
horde_horde.php horde_html.php horde_mime_drivers.php
horde_mime_mapping.php horde_registry.php iCalendar.php
imp_conf.php imp_html.php imp_mime_drivers.php imp_prefs.php
imp_servers.php kronolith_conf.php kronolith_html.php
kronolith_kolab.php kronolith_prefs.php mnemo_conf.php
mnemo_kolab.php mnemo_menu.php mnemo_prefs.php nag_conf.php
nag_html.php nag_kolab.php nag_prefs.php turba_attributes.php
turba_conf.php turba_html.php turba_kolab.php turba_prefs.php
turba_sources.php valarm.php vevent.php vfreebusy.php
vjournal.php vtimezone.php vtodo.php
Log Message:
Clean horde directory.
--- CHANGELOG DELETED ---
--- Kolab.php DELETED ---
--- Makefile DELETED ---
--- String.php DELETED ---
--- horde.spec DELETED ---
--- horde_horde.php DELETED ---
--- horde_html.php DELETED ---
--- horde_mime_drivers.php DELETED ---
--- horde_mime_mapping.php DELETED ---
--- horde_registry.php DELETED ---
--- iCalendar.php DELETED ---
--- imp_conf.php DELETED ---
--- imp_html.php DELETED ---
--- imp_mime_drivers.php DELETED ---
--- imp_prefs.php DELETED ---
--- imp_servers.php DELETED ---
--- kronolith_conf.php DELETED ---
--- kronolith_html.php DELETED ---
--- kronolith_kolab.php DELETED ---
--- kronolith_prefs.php DELETED ---
--- mnemo_conf.php DELETED ---
--- mnemo_kolab.php DELETED ---
--- mnemo_menu.php DELETED ---
--- mnemo_prefs.php DELETED ---
--- nag_conf.php DELETED ---
--- nag_html.php DELETED ---
--- nag_kolab.php DELETED ---
--- nag_prefs.php DELETED ---
--- turba_attributes.php DELETED ---
--- turba_conf.php DELETED ---
--- turba_html.php DELETED ---
--- turba_kolab.php DELETED ---
--- turba_prefs.php DELETED ---
--- turba_sources.php DELETED ---
--- valarm.php DELETED ---
--- vevent.php DELETED ---
--- vfreebusy.php DELETED ---
--- vjournal.php DELETED ---
--- vtimezone.php DELETED ---
--- vtodo.php DELETED ---
From cvs at kolab.org Fri May 25 12:16:08 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 12:16:08 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd kolab_bootstrap.in,1.25,1.26
Message-ID: <20070525101608.B2B5F617E70@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv15871/kolabd/kolabd
Modified Files:
kolab_bootstrap.in
Log Message:
Don't quote exclamation mark in manager password, fixes kolab/issue919
(kolab server has problems with some characters in passwords)
Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- kolab_bootstrap.in 11 Feb 2007 14:47:51 -0000 1.25
+++ kolab_bootstrap.in 25 May 2007 10:16:06 -0000 1.26
@@ -38,7 +38,7 @@
my($str, $metas) = @_;
$str =~ s/([\\"])/\\$1/g;
if(defined $metas) {
- $metas = '!$`' if $metas eq ":shell";
+ $metas = '$`' if $metas eq ":shell";
$metas =~ s/\]/\\]/g;
$str =~ s/([$metas])/\\$1/g;
}
From cvs at kolab.org Fri May 25 12:16:08 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 12:16:08 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.120,1.121
Message-ID: <20070525101608.A4A74617E6E@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv15871
Modified Files:
release-notes.txt
Log Message:
Don't quote exclamation mark in manager password, fixes kolab/issue919
(kolab server has problems with some characters in passwords)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- release-notes.txt 24 May 2007 10:20:26 -0000 1.120
+++ release-notes.txt 25 May 2007 10:16:06 -0000 1.121
@@ -32,8 +32,9 @@
Changes between 2.1.0 and 2.1.???:
- - kolabd-2.1.0-20070510
+ - kolabd-2.1.0-2007????
+ kolab/issue919 (kolab server has problems with some characters in passwords)
kolab/issue1126 (ldap_simple_bind() failed and Domain/Realm not available) - partial fix
- kolab-resource-handlers-2.1.0-2007????
From cvs at kolab.org Fri May 25 12:21:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 12:21:46 +0200 (CEST)
Subject: gunnar: server/horde Makefile, 1.8, 1.9 conf.php, NONE, 1.1 hooks.php,
NONE, 1.1 horde-kolab-conf.template, NONE, 1.1 horde-kolab.spec,
NONE, 1.1 registry.php, NONE, 1.1
Message-ID: <20070525102146.8DE12617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde
In directory doto:/tmp/cvs-serv16040
Added Files:
Makefile conf.php hooks.php horde-kolab-conf.template
horde-kolab.spec registry.php
Log Message:
The package definition for the basic horde package.
--- NEW FILE: conf.php ---
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
// $Horde: horde/config/conf.xml,v 1.183 2007/05/21 15:17:40 slusarz Exp $
$conf['vhosts'] = false;
$conf['debug_level'] = E_ALL;
$conf['max_exec_time'] = 0;
$conf['compress_pages'] = true;
$conf['umask'] = 077;
$conf['use_ssl'] = 2;
$conf['server']['name'] = $_SERVER['SERVER_NAME'];
$conf['server']['port'] = $_SERVER['SERVER_PORT'];
$conf['session']['name'] = 'Horde';
$conf['session']['use_only_cookies'] = false;
$conf['session']['cache_limiter'] = 'nocache';
$conf['session']['timeout'] = 3600;
$conf['cookie']['path'] = '/horde';
$conf['auth']['admins'] = array('manager');
$conf['auth']['checkip'] = true;
$conf['auth']['checkbrowser'] = true;
$conf['auth']['alternate_login'] = false;
$conf['auth']['redirect_on_logout'] = false;
$conf['auth']['params']['login_block'] = true;
$conf['auth']['params']['login_block_count'] = 3;
$conf['auth']['params']['login_block_time'] = 5;
$conf['auth']['driver'] = 'kolab';
$conf['signup']['allow'] = false;
$conf['log']['priority'] = PEAR_LOG_NOTICE;
$conf['log']['ident'] = 'HORDE';
$conf['log']['params'] = array();
$conf['log']['name'] = '/tmp/horde.log';
$conf['log']['params']['append'] = true;
$conf['log']['type'] = 'file';
$conf['log']['enabled'] = true;
$conf['log_accesskeys'] = false;
$conf['prefs']['driver'] = 'kolab';
$conf['alarms']['driver'] = false;
$conf['datatree']['driver'] = 'null';
$conf['group']['driver'] = 'datatree';
$conf['group']['cache'] = false;
$conf['share']['cache'] = false;
$conf['share']['driver'] = 'kolab';
$conf['cache']['default_lifetime'] = 1800;
$conf['cache']['params']['dir'] = Horde::getTempDir();
$conf['cache']['params']['sub'] = 0;
$conf['cache']['params']['gc'] = 86400;
$conf['cache']['driver'] = 'file';
$conf['token']['driver'] = 'none';
$conf['mailer']['params']['auth'] = '0';
$conf['mailer']['type'] = 'smtp';
$conf['vfs']['params']['vfsroot'] = '/tmp';
$conf['vfs']['type'] = 'file';
$conf['sessionhandler']['type'] = 'none';
$conf['image']['convert'] = '/usr/bin/convert';
$conf['mime']['magic_db'] = '/etc/mime.types';
$conf['problems']['tickets'] = false;
$conf['menu']['apps'] = array();
$conf['menu']['always'] = false;
$conf['menu']['links']['help'] = 'all';
$conf['menu']['links']['help_about'] = true;
$conf['menu']['links']['options'] = 'authenticated';
$conf['menu']['links']['problem'] = 'all';
$conf['menu']['links']['login'] = 'all';
$conf['menu']['links']['logout'] = 'authenticated';
$conf['hooks']['permsdenied'] = false;
$conf['hooks']['username'] = false;
$conf['hooks']['preauthenticate'] = false;
$conf['hooks']['postauthenticate'] = false;
$conf['hooks']['authldap'] = false;
$conf['hooks']['groupldap'] = false;
$conf['portal']['fixed_blocks'] = array();
$conf['accounts']['driver'] = 'null';
$conf['user']['verify_from_addr'] = false;
$conf['imsp']['enabled'] = false;
$conf['kolab']['ldap']['server'] = 'localhost';
$conf['kolab']['ldap']['port'] = 389;
$conf['kolab']['imap']['port'] = 143;
$conf['kolab']['imap']['sieveport'] = 2000;
$conf['kolab']['imap']['virtdomains'] = true;
$conf['kolab']['smtp']['server'] = 'localhost';
$conf['kolab']['smtp']['port'] = 25;
$conf['kolab']['misc']['multidomain'] = false;
$conf['kolab']['enabled'] = true;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
if (file_exists(dirname(__FILE__) . '/kolab.php')) {
require_once(dirname(__FILE__) . '/kolab.php');
}
--- NEW FILE: hooks.php ---
<?php
/**
* Horde Hooks configuration file.
*
* THE HOOKS PROVIDED IN THIS FILE ARE EXAMPLES ONLY. DO NOT ENABLE THEM
* BLINDLY IF YOU DO NOT KNOW WHAT YOU ARE DOING. YOU HAVE TO CUSTOMIZE THEM
* TO MATCH YOUR SPECIFIC NEEDS AND SYSTEM ENVIRONMENT.
*
* This file is where you define any hooks, for preferences or general Horde
* use, that your installation uses. The functions in this file can vastly
* change how your installation behaves, so make sure to test out any changes
* here before doing them in a production environment.
*
* Hook function names are automatically determined. The format of the name
* is:
*
* _<type of hook>_hook_<name of hook>.
*
* Types of hooks that are defined in this file are 'prefs' (hooks to set the
* value of preferences), 'horde' (hooks for the Horde Framework scripts) and
* 'app' (where app is any Horde application name, like 'imp') hooks that are
* application specific.
*
* So, a hook to set the preference 'theme' would be named
* "_prefs_hook_theme".
*
* NOTE 1: Having a hook function in this file does NOT mean that the hook
* will automatically be used. YOU MUST enable the hook. For preferences, set
* 'hook' => true in that preferences attributes; for other hooks, there will
* be a configuration option in each application's conf.php file such as
* $conf['hooks']['hookname'] which must be set to true.
*
* NOTE 2: Preferences hooks are ONLY executed on login. Preferences are
* cached during a users session and, to avoid unnecessary overhead every time
* a preference is accessed, the results of hooks are cached as well. This
* leads to ...
*
* NOTE 3: Any preference that is NOT LOCKED, that is set by a hook, WILL BE
* SAVED WITH THAT VALUE. This means several things:
* 1) Users will get the results of the hook set for them in their
* preferences.
* 2) By virtue of this, the next time they log in and load their
* preferences, the hook will NOT be called, because in their last session,
* we saved the results of the hook for them. However, if the preference is
* locked, the result of the hook will never be saved.
*
* $Horde: horde/config/hooks.php.dist,v 1.109 2007/01/03 06:26:08 slusarz Exp $
*/
// Default Kolab hooks:
if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
require_once 'Horde/Kolab.php';
if (!function_exists('_username_hook_frombackend')) {
function _username_hook_frombackend($userID)
{
// Connect to the LDAP server.
$ds = ldap_connect(
$GLOBALS['conf']['kolab']['ldap']['server'],
$GLOBALS['conf']['kolab']['ldap']['port']
);
if (!$ds) {
return $userID;
}
ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
// Bind anonymously.
$result = @ldap_bind($ds);
if (!$result) {
return $userID;
}
// Find the user's DN.
$result = ldap_search(
$ds,
$GLOBALS['conf']['kolab']['ldap']['basedn'],
'uid=' . $userID
);
$entry = ldap_first_entry($ds, $result);
if ($entry === false) {
// The user already authenticated with his email address.
return $userID;
}
$email = ldap_get_values($ds, $entry, 'mail');
return $email[0];
}
function _imp_hook_mbox_redirect($mailbox)
{
switch (Kolab::getMailboxType($mailbox)) {
case 'event':
return $GLOBALS['registry']->get('webroot', 'kronolith');
case 'task':
return $GLOBALS['registry']->get('webroot', 'nag');
case 'note':
return $GLOBALS['registry']->get('webroot', 'mnemo');
case 'contact':
return $GLOBALS['registry']->get('webroot', 'turba');
default:
return '';
}
}
function _imp_hook_mbox_icons()
{
static $icons;
if (!empty($icons)) {
return $icons;
}
$folders = Kolab::listFolders();
$icons = array();
foreach ($folders as $folder) {
$name = preg_replace('/^{[^}]+}/', '', $folder[0]);
switch ($folder[1]) {
case 'event':
$icons[$name] = array(
'icon' => 'kronolith.png',
'icondir' => $GLOBALS['registry']->getImageDir('kronolith'),
'alt' => _("Calendar")
);
break;
case 'task':
$icons[$name] = array(
'icon' => 'nag.png',
'icondir' => $GLOBALS['registry']->getImageDir('nag'),
'alt' => _("Tasks")
);
break;
case 'note':
$icons[$name] = array(
'icon' => 'mnemo.png',
'icondir' => $GLOBALS['registry']->getImageDir('mnemo'),
'alt' => _("Notes")
);
break;
case 'contact':
$icons[$name] = array(
'icon' => 'turba.png',
'icondir' => $GLOBALS['registry']->getImageDir('turba'),
'alt' => _("Contacts")
);
break;
}
}
return $icons;
}
}
if (!function_exists('_horde_hook_preauthenticate')) {
function _horde_hook_preauthenticate($userID, $credential, $realm)
{
/**
* In multidomain mode we authenticate against the home server
* of the user, so first we have to query the global ldap server
* for the users 'kolabHomeserver' entry and then we modify the
* PHP session variables to use the home server.
*/
$ds = ldap_connect(
$GLOBALS['conf']['kolab']['ldap']['server'],
$GLOBALS['conf']['kolab']['ldap']['port']
);
if (!$ds) {
return false;
}
// Bind anonymously.
$result = @ldap_bind($ds,
$GLOBALS['conf']['kolab']['ldap']['binddn'],
$GLOBALS['conf']['kolab']['ldap']['bindpw']
);
if (!$result) {
return false;
}
// Find the user's DN.
$result = ldap_search(
$ds,
$GLOBALS['conf']['kolab']['ldap']['basedn'],
"uid=$userID"
);
$entry = ldap_first_entry($ds, $result);
if ($entry === false) {
return false;
}
$result = ldap_get_values($ds, $entry, 'kolabHomeserver');
if (!$result) {
// 'manager' has no 'kolabHomserver' set, so don't treat it as error
$homeserver = $GLOBALS['conf']['kolab']['imap']['server'];
} else {
// We found a valid homeserver
$homeserver = $result[0];
}
$_SESSION['kolabHomeserver'] = $homeserver;
return true;
}
}
}
--- NEW FILE: horde-kolab-conf.template ---
KOLAB_META_START
TARGET=/kolab/var/kolab/www/horde/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=kolab-n:kolab-n
KOLAB_META_END
<?php
$conf['cookie']['domain'] = @@@fqdnhostname@@@;
$conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
$conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
$conf['kolab']['ldap']['binddn'] = 'cn=manager,cn=internal,@@@base_dn@@@';
$conf['kolab']['ldap']['bindpw'] = '@@@bind_pw@@@';
$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
$conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
$conf['kolab']['imap']['adminpw'] = '@@@bind_pw@@@';
?>
--- NEW FILE: horde-kolab.spec ---
# Versions
%define V_horde_name horde
%define V_package %{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
%define V_day 24
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
# Package Information
Name: %{V_package}
Summary: The Horde Application Framework
URL: http://www.horde.org/
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: %{V_version}
Release: %{V_release}
Class: JUNK
License: GPL
Group: MAIL
Distribution: OpenPKG
# List of Sources
Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
Source1: horde-kolab-conf.template
Source2: hooks.php
Source3: conf.php
Source4: registry.php
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
PreReq: PEAR-Mail_Mime >= 1.3.1, PEAR-Mail >= 1.1.14, horde-framework-kolab >= 20070315, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
%description
The Horde Framework is the glue that all Horde applications have in
common. It is many things, including some coding standards, common
code, and inter-application communication. The shared code provides
common ways of handling things like preferences, permissions, browser
detection, user help, and more.
%prep
%setup -c -q
%build
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
cd horde/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
cp -r horde $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2} %{S:3} %{S:4} \
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kolab-conf.template'\
'%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/config/conf.php' \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/conf.php' \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/hooks.php' \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/registry.php'
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: registry.php ---
<?php
/**
* registry.php -- Horde application registry.
*
* $Horde: horde/config/registry.php.dist,v 1.294 2006/11/24 10:39:09 jan Exp $
*
* This configuration file is used by Horde to determine which Horde
* applications are installed and where, as well as how they interact.
*
* Application registry
* --------------------
* The following settings register installed Horde applications.
* By default, Horde assumes that the application directories live
* inside the horde directory.
*
* Attribute Type Description
* --------- ---- -----------
* fileroot string The base filesystem path for the module's files.
* webroot string The base URI for the module.
* jsuri string The base URI for static javascript files.
* jsfs string The base filesystem path for static javascript files.
* themesuri string The base URI for the themes. This can be used to
* serve all icons and style sheets from a separate
* server.
* themesfs string The base file system directory for the themes.
* icon string The URI for an icon to show in menus for the module.
* Setting this will override the default theme-based
* logic in the code.
* name string The name used in menus and descriptions for a module
* status string 'inactive', 'hidden', 'notoolbar', 'heading',
* 'block', 'admin', or 'active'.
* provides string Service types the module provides.
* initial_page string The initial (default) page (filename) for the module.
* templates string The filesystem path to the templates directory.
* menu_parent string The name of the 'heading' group that this app should
* show up under.
* target string The (optional) target frame for the link.
* url string The (optional) URL of 'heading' entries.
*/
// We try to automatically determine the proper webroot for Horde here. This
// still assumes that applications live under horde/. If this results in
// incorrect results for you, simply change the 'webroot' setting in the
// 'horde' stanza below.
$this->applications['horde'] = array(
'fileroot' => dirname(__FILE__) . '/..',
'webroot' => _detect_webroot(),
'initial_page' => 'login.php',
'name' => _("Horde"),
'status' => 'active',
'templates' => dirname(__FILE__) . '/../templates',
'provides' => 'horde',
);
$this->applications['mimp'] = array(
'fileroot' => dirname(__FILE__) . '/../mimp',
'webroot' => $this->applications['horde']['webroot'] . '/mimp',
'name' => _("Mobile Mail"),
'status' => 'notoolbar',
);
$this->applications['dimp'] = array(
'fileroot' => dirname(__FILE__) . '/../dimp',
'webroot' => $this->applications['horde']['webroot'] . '/dimp',
'name' => _("Dynamic Mail"),
'status' => 'notoolbar',
);
$this->applications['imp'] = array(
'fileroot' => dirname(__FILE__) . '/../imp',
'webroot' => $this->applications['horde']['webroot'] . '/imp',
'name' => _("Mail"),
'status' => 'active',
'provides' => array('mail', 'contacts/favouriteRecipients')
);
$this->applications['ingo'] = array(
'fileroot' => dirname(__FILE__) . '/../ingo',
'webroot' => $this->applications['horde']['webroot'] . '/ingo',
'name' => _("Filters"),
'status' => 'active',
'provides' => array('mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist', 'mail/applyFilters', 'mail/canApplyFilters', 'mail/showFilters'),
'menu_parent' => 'imp'
);
$this->applications['sam'] = array(
'fileroot' => dirname(__FILE__) . '/../sam',
'webroot' => $this->applications['horde']['webroot'] . '/sam',
'name' => _("Spam"),
'status' => 'inactive',
// Uncomment this line if you want Sam to handle the blacklist filter
// instead of Ingo:
// 'provides' => array('mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist'),
'menu_parent' => 'imp'
);
$this->applications['forwards'] = array(
'fileroot' => dirname(__FILE__) . '/../forwards',
'webroot' => $this->applications['horde']['webroot'] . '/forwards',
'name' => _("Forwards"),
'status' => 'inactive',
'provides' => 'forwards',
'menu_parent' => 'imp',
);
$this->applications['vacation'] = array(
'fileroot' => dirname(__FILE__) . '/../vacation',
'webroot' => $this->applications['horde']['webroot'] . '/vacation',
'name' => _("Vacation"),
'status' => 'inactive',
'provides' => 'vacation',
'menu_parent' => 'imp'
);
$this->applications['imp-folders'] = array(
'status' => 'block',
'app' => 'imp',
'blockname' => 'tree_folders',
'menu_parent' => 'imp',
);
$this->applications['organizing'] = array(
'name' => _("Organizing"),
'status' => 'heading',
);
$this->applications['turba'] = array(
'fileroot' => dirname(__FILE__) . '/../turba',
'webroot' => $this->applications['horde']['webroot'] . '/turba',
'name' => _("Address Book"),
'status' => 'active',
'provides' => array('contacts', 'clients'),
'menu_parent' => 'organizing'
);
$this->applications['turba-menu'] = array(
'status' => 'block',
'app' => 'turba',
'blockname' => 'tree_menu',
'menu_parent' => 'turba',
);
$this->applications['kronolith'] = array(
'fileroot' => dirname(__FILE__) . '/../kronolith',
'webroot' => $this->applications['horde']['webroot'] . '/kronolith',
'name' => _("Calendar"),
'status' => 'active',
'provides' => 'calendar',
'menu_parent' => 'organizing'
);
$this->applications['kronolith-alarms'] = array(
'status' => 'block',
'app' => 'kronolith',
'blockname' => 'tree_alarms',
'menu_parent' => 'kronolith',
);
$this->applications['kronolith-menu'] = array(
'status' => 'block',
'app' => 'kronolith',
'blockname' => 'tree_menu',
'menu_parent' => 'kronolith',
);
$this->applications['nag'] = array(
'fileroot' => dirname(__FILE__) . '/../nag',
'webroot' => $this->applications['horde']['webroot'] . '/nag',
'name' => _("Tasks"),
'status' => 'active',
'provides' => 'tasks',
'menu_parent' => 'organizing'
);
$this->applications['nag-alarms'] = array(
'status' => 'block',
'app' => 'nag',
'blockname' => 'tree_alarms',
'menu_parent' => 'nag',
);
$this->applications['nag-menu'] = array(
'status' => 'block',
'app' => 'nag',
'blockname' => 'tree_menu',
'menu_parent' => 'nag',
);
$this->applications['mnemo'] = array(
'fileroot' => dirname(__FILE__) . '/../mnemo',
'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
'name' => _("Notes"),
'status' => 'active',
'provides' => 'notes',
'menu_parent' => 'organizing'
);
$this->applications['mnemo-menu'] = array(
'status' => 'block',
'app' => 'mnemo',
'blockname' => 'tree_menu',
'menu_parent' => 'mnemo',
);
$this->applications['genie'] = array(
'fileroot' => dirname(__FILE__) . '/../genie',
'webroot' => $this->applications['horde']['webroot'] . '/genie',
'name' => _("Wishlist"),
'status' => 'inactive',
'provides' => 'wishlist',
'menu_parent' => 'organizing'
);
$this->applications['trean'] = array(
'fileroot' => dirname(__FILE__) . '/../trean',
'webroot' => $this->applications['horde']['webroot'] . '/trean',
'name' => _("Bookmarks"),
'status' => 'inactive',
'provides' => 'bookmarks',
'menu_parent' => 'organizing'
);
$this->applications['trean-menu'] = array(
'status' => 'block',
'app' => 'trean',
'blockname' => 'tree_menu',
'menu_parent' => 'trean',
);
$this->applications['devel'] = array(
'name' => _("Development"),
'status' => 'heading',
);
$this->applications['chora'] = array(
'fileroot' => dirname(__FILE__) . '/../chora',
'webroot' => $this->applications['horde']['webroot'] . '/chora',
'name' => _("Version Control"),
'status' => 'active',
'menu_parent' => 'devel'
);
$this->applications['chora-menu'] = array(
'status' => 'block',
'app' => 'chora',
'blockname' => 'tree_menu',
'menu_parent' => 'chora',
);
$this->applications['whups'] = array(
'fileroot' => dirname(__FILE__) . '/../whups',
'webroot' => $this->applications['horde']['webroot'] . '/whups',
'name' => _("Tickets"),
'status' => 'inactive',
'provides' => 'tickets',
'menu_parent' => 'devel'
);
$this->applications['luxor'] = array(
'fileroot' => dirname(__FILE__) . '/../luxor',
'webroot' => $this->applications['horde']['webroot'] . '/luxor',
'name' => _("X-Ref"),
'status' => 'inactive',
'menu_parent' => 'devel'
);
$this->applications['info'] = array(
'name' => _("Information"),
'status' => 'heading',
);
$this->applications['klutz'] = array(
'fileroot' => dirname(__FILE__) . '/../klutz',
'webroot' => $this->applications['horde']['webroot'] . '/klutz',
'name' => _("Comics"),
'status' => 'inactive',
'provides' => 'comics',
'menu_parent' => 'info'
);
$this->applications['occam'] = array(
'fileroot' => dirname(__FILE__) . '/../occam',
'webroot' => $this->applications['horde']['webroot'] . '/occam',
'name' => _("Courses"),
'status' => 'inactive',
'menu_parent' => 'info'
);
$this->applications['mottle'] = array(
'fileroot' => dirname(__FILE__) . '/../mottle',
'webroot' => $this->applications['horde']['webroot'] . '/mottle',
'name' => _("MOTD"),
'status' => 'inactive',
'menu_parent' => 'info'
);
$this->applications['jonah'] = array(
'fileroot' => dirname(__FILE__) . '/../jonah',
'webroot' => $this->applications['horde']['webroot'] . '/jonah',
'name' => _("News"),
'status' => 'inactive',
'provides' => 'news',
'menu_parent' => 'info'
);
$this->applications['jonah-menu'] = array(
'status' => 'block',
'app' => 'jonah',
'blockname' => 'tree_menu',
'menu_parent' => 'jonah',
);
$this->applications['goops'] = array(
'fileroot' => dirname(__FILE__) . '/../goops',
'webroot' => $this->applications['horde']['webroot'] . '/goops',
'name' => _("Search Engines"),
'status' => 'inactive',
'menu_parent' => 'info'
);
$this->applications['office'] = array(
'name' => _("Office"),
'status' => 'heading',
);
$this->applications['juno'] = array(
'fileroot' => dirname(__FILE__) . '/../juno',
'webroot' => $this->applications['horde']['webroot'] . '/juno',
'name' => _("Accounting"),
'status' => 'inactive',
'menu_parent' => 'office'
);
$this->applications['midas'] = array(
'fileroot' => dirname(__FILE__) . '/../midas',
'webroot' => $this->applications['horde']['webroot'] . '/midas',
'name' => _("Ads"),
'status' => 'inactive',
'menu_parent' => 'office'
);
$this->applications['hylax'] = array(
'fileroot' => dirname(__FILE__) . '/../hylax',
'webroot' => $this->applications['horde']['webroot'] . '/hylax',
'name' => _("Faxes"),
'status' => 'inactive',
'menu_parent' => 'office',
);
$this->applications['sesha'] = array(
'fileroot' => dirname(__FILE__) . '/../sesha',
'webroot' => $this->applications['horde']['webroot'] . '/sesha',
'name' => _("Inventory"),
'status' => 'inactive',
// Uncomment this line if you want Sesha to provide queue and version
// names instead of Whups:
// 'provides' => array('tickets/listQueues', 'tickets/getQueueDetails', 'tickets/listVersions', 'tickets/getVersionDetails'),
'menu_parent' => 'office',
);
$this->applications['thor'] = array(
'fileroot' => dirname(__FILE__) . '/../thor',
'webroot' => $this->applications['horde']['webroot'] . '/thor',
'name' => _("Projects"),
'status' => 'inactive',
'provides' => 'projects',
'menu_parent' => 'office'
);
$this->applications['rakim'] = array(
'fileroot' => dirname(__FILE__) . '/../rakim',
'webroot' => $this->applications['horde']['webroot'] . '/rakim',
'name' => _("Support"),
'status' => 'inactive',
'menu_parent' => 'office'
);
$this->applications['hermes'] = array(
'fileroot' => dirname(__FILE__) . '/../hermes',
'webroot' => $this->applications['horde']['webroot'] . '/hermes',
'name' => _("Time Tracking"),
'status' => 'inactive',
'menu_parent' => 'office',
'provides' => 'time'
);
$this->applications['hermes-stopwatch'] = array(
'status' => 'block',
'app' => 'hermes',
'blockname' => 'tree_stopwatch',
'menu_parent' => 'hermes',
);
$this->applications['hermes-menu'] = array(
'status' => 'block',
'app' => 'hermes',
'blockname' => 'tree_menu',
'menu_parent' => 'hermes',
);
$this->applications['myaccount'] = array(
'name' => _("My Account"),
'status' => 'heading',
);
$this->applications['gollem'] = array(
'fileroot' => dirname(__FILE__) . '/../gollem',
'webroot' => $this->applications['horde']['webroot'] . '/gollem',
'name' => _("File Manager"),
'status' => 'active',
'menu_parent' => 'myaccount',
'provides' => 'files',
);
$this->applications['gollem-menu'] = array(
'status' => 'block',
'app' => 'gollem',
'blockname' => 'tree_menu',
'menu_parent' => 'gollem',
);
$this->applications['passwd'] = array(
'fileroot' => dirname(__FILE__) . '/../passwd',
'webroot' => $this->applications['horde']['webroot'] . '/passwd',
'name' => _("Password"),
'status' => 'active',
'menu_parent' => 'myaccount'
);
$this->applications['jeta'] = array(
'fileroot' => dirname(__FILE__) . '/../jeta',
'webroot' => $this->applications['horde']['webroot'] . '/jeta',
'name' => _("SSH"),
'status' => 'inactive',
'menu_parent' => 'myaccount'
);
$this->applications['website'] = array(
'name' => _("Web Site"),
'status' => 'heading',
);
$this->applications['giapeto'] = array(
'fileroot' => dirname(__FILE__) . '/../giapeto',
'webroot' => $this->applications['horde']['webroot'] . '/giapeto',
'name' => _("CMS"),
'status' => 'inactive',
'provides' => 'cms',
'menu_parent' => 'website'
);
$this->applications['agora'] = array(
'fileroot' => dirname(__FILE__) . '/../agora',
'webroot' => $this->applications['horde']['webroot'] . '/agora',
'name' => _("Forums"),
'status' => 'inactive',
'provides' => 'forums',
'menu_parent' => 'website'
);
$this->applications['ulaform'] = array(
'fileroot' => dirname(__FILE__) . '/../ulaform',
'webroot' => $this->applications['horde']['webroot'] . '/ulaform',
'name' => _("Forms"),
'status' => 'inactive',
'menu_parent' => 'website'
);
$this->applications['volos'] = array(
'fileroot' => dirname(__FILE__) . '/../volos',
'webroot' => $this->applications['horde']['webroot'] . '/volos',
'name' => _("Guestbook"),
'status' => 'inactive',
'menu_parent' => 'website'
);
$this->applications['ansel'] = array(
'fileroot' => dirname(__FILE__) . '/../ansel',
'webroot' => $this->applications['horde']['webroot'] . '/ansel',
'name' => _("Photos"),
'status' => 'inactive',
'provides' => 'images',
'menu_parent' => 'website'
);
$this->applications['scry'] = array(
'fileroot' => dirname(__FILE__) . '/../scry',
'webroot' => $this->applications['horde']['webroot'] . '/scry',
'name' => _("Polls"),
'status' => 'inactive',
'provides' => 'polls',
'menu_parent' => 'website'
);
$this->applications['merk'] = array(
'fileroot' => dirname(__FILE__) . '/../merk',
'webroot' => $this->applications['horde']['webroot'] . '/merk',
'name' => _("Shopping"),
'status' => 'inactive',
'provides' => 'shop',
'menu_parent' => 'website'
);
$this->applications['swoosh'] = array(
'fileroot' => dirname(__FILE__) . '/../swoosh',
'webroot' => $this->applications['horde']['webroot'] . '/swoosh',
'name' => _("SMS Messaging"),
'status' => 'inactive',
'provides' => 'sms',
'menu_parent' => 'website'
);
$this->applications['wicked'] = array(
'fileroot' => dirname(__FILE__) . '/../wicked',
'webroot' => $this->applications['horde']['webroot'] . '/wicked',
'name' => _("Wiki"),
'status' => 'inactive',
'provides' => 'wiki',
'menu_parent' => 'website'
);
$this->applications['vilma'] = array(
'fileroot' => dirname(__FILE__) . '/../vilma',
'webroot' => $this->applications['horde']['webroot'] . '/vilma',
'name' => _("Mail Admin"),
'status' => 'inactive',
'menu_parent' => 'administration'
);
$this->applications['nic'] = array(
'fileroot' => dirname(__FILE__) . '/../nic',
'webroot' => $this->applications['horde']['webroot'] . '/nic',
'name' => _("Network Tools"),
'status' => 'active',
'menu_parent' => 'administration'
);
function _detect_webroot()
{
// Note for Windows users: the below assumes that your PHP_SELF variable
// uses forward slashes. If it does not, you'll have to tweak this.
if (isset($_SERVER['SCRIPT_URL']) || isset($_SERVER['SCRIPT_NAME'])) {
$path = empty($_SERVER['SCRIPT_URL']) ?
$_SERVER['SCRIPT_NAME'] :
$_SERVER['SCRIPT_URL'];
$hordedir = str_replace(DIRECTORY_SEPARATOR, '/', __FILE__);
$hordedir = basename(preg_replace(';/config/registry.php$;', '', $hordedir));
if (preg_match(';/' . $hordedir . ';', $path)) {
$webroot = preg_replace(';/' . $hordedir . '.*;', '/' . $hordedir, $path);
} else {
$webroot = '';
}
} elseif (isset($_SERVER['PHP_SELF'])) {
$webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY);
$webroot = strstr(dirname(__FILE__), DIRECTORY_SEPARATOR . array_shift($webroot));
if ($webroot !== false) {
$webroot = preg_replace(array('/\\\\/', ';/config$;'), array('/', ''), $webroot);
} elseif ($webroot === false) {
$webroot = '';
} else {
$webroot = '/horde';
}
} else {
$webroot = '/horde';
}
return $webroot;
}
From cvs at kolab.org Fri May 25 12:22:30 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 12:22:30 +0200 (CEST)
Subject: gunnar: server/horde-framework Makefile,1.2,1.3
Message-ID: <20070525102230.8B387617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-framework
In directory doto:/tmp/cvs-serv16082
Modified Files:
Makefile
Log Message:
Handle patches in a different way so that we can use the same Makefile for all Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde-framework/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 25 May 2007 09:25:20 -0000 1.2
+++ Makefile 25 May 2007 10:22:28 -0000 1.3
@@ -10,6 +10,7 @@
VERSION = ${YEAR}${MONTH}${DAY}
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
@@ -25,8 +26,14 @@
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
- cp *.patch $(KOLABRPMSRC)/$(PACKAGE)
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+
+ if [ -n "$(PATCHES)" ]; then \
+ for PATCH in $(PATCHES); \
+ do \
+ cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
+ done; \
+ fi
if [ -n "$(TEMPLATES)" ]; then \
for TEMPLATE in $(TEMPLATES); \
From cvs at kolab.org Fri May 25 12:22:51 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 12:22:51 +0200 (CEST)
Subject: gunnar: server/horde-imp - New directory
Message-ID: <20070525102251.E4F5C617E70@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-imp
In directory doto:/tmp/cvs-serv16099/horde-imp
Log Message:
Directory /kolabrepository/server/horde-imp added to the repository
From cvs at kolab.org Fri May 25 12:52:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 12:52:26 +0200 (CEST)
Subject: gunnar: server/horde conf.php,1.1,1.2
Message-ID: <20070525105226.D52F9617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde
In directory doto:/tmp/cvs-serv16627
Modified Files:
conf.php
Log Message:
Updated horde package configuration.
Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/conf.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- conf.php 25 May 2007 10:21:44 -0000 1.1
+++ conf.php 25 May 2007 10:52:24 -0000 1.2
@@ -13,7 +13,9 @@
$conf['session']['use_only_cookies'] = false;
$conf['session']['cache_limiter'] = 'nocache';
$conf['session']['timeout'] = 3600;
+$conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
$conf['cookie']['path'] = '/horde';
+$conf['sql']['phptype'] = false;
$conf['auth']['admins'] = array('manager');
$conf['auth']['checkip'] = true;
$conf['auth']['checkbrowser'] = true;
@@ -52,6 +54,8 @@
$conf['sessionhandler']['type'] = 'none';
$conf['image']['convert'] = '/usr/bin/convert';
$conf['mime']['magic_db'] = '/etc/mime.types';
+$conf['problems']['email'] = 'webmaster at example.com';
+$conf['problems']['maildomain'] = 'example.com';
$conf['problems']['tickets'] = false;
$conf['menu']['apps'] = array();
$conf['menu']['always'] = false;
@@ -73,9 +77,14 @@
$conf['imsp']['enabled'] = false;
$conf['kolab']['ldap']['server'] = 'localhost';
$conf['kolab']['ldap']['port'] = 389;
+$conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
+$conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
+$conf['kolab']['ldap']['phppw'] = '';
+$conf['kolab']['imap']['server'] = 'localhost';
$conf['kolab']['imap']['port'] = 143;
$conf['kolab']['imap']['sieveport'] = 2000;
$conf['kolab']['imap']['virtdomains'] = true;
+$conf['kolab']['imap']['maildomain'] = 'example.com';
$conf['kolab']['smtp']['server'] = 'localhost';
$conf['kolab']['smtp']['port'] = 25;
$conf['kolab']['misc']['multidomain'] = false;
From cvs at kolab.org Fri May 25 12:55:39 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 12:55:39 +0200 (CEST)
Subject: gunnar: server/horde-imp Makefile, NONE, 1.1 conf.php, NONE,
1.1 horde-imp-kolab.spec, NONE, 1.1 servers.php, NONE, 1.1
Message-ID: <20070525105539.971FC617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-imp
In directory doto:/tmp/cvs-serv16704
Added Files:
Makefile conf.php horde-imp-kolab.spec servers.php
Log Message:
The horde-imp package.
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = ${YEAR}${MONTH}${DAY}
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
if [ -n "$(PATCHES)" ]; then \
for PATCH in $(PATCHES); \
do \
cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(TEMPLATES)" ]; then \
for TEMPLATE in $(TEMPLATES); \
do \
cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(CONFIGS)" ]; then \
for CONFIG in $(CONFIGS); \
do \
cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE); \
done; \
fi
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
--- NEW FILE: conf.php ---
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
// $Horde: imp/config/conf.xml,v 1.101 2007/05/03 15:25:18 chuck Exp $
$conf['spell']['path'] = '/usr/bin/aspell';
$conf['spell']['driver'] = 'aspell';
$conf['utils']['gnupg'] = '/usr/bin/gpg';
$conf['utils']['gnupg_keyserver'] = array('wwwkeys.pgp.net');
$conf['utils']['gnupg_timeout'] = 10;
$conf['utils']['openssl_cafile'] = '/etc/ssl/certs';
$conf['utils']['openssl_binary'] = '/usr/bin/openssl';
$conf['menu']['apps'] = array();
$conf['user']['select_sentmail_folder'] = true;
$conf['user']['allow_resume_all_in_drafts'] = false;
$conf['user']['allow_folders'] = true;
$conf['user']['allow_resume_all'] = false;
$conf['user']['allow_view_source'] = true;
$conf['user']['alternate_login'] = false;
$conf['user']['redirect_on_logout'] = false;
$conf['user']['select_view'] = true;
$conf['server']['change_server'] = false;
$conf['server']['change_port'] = false;
$conf['server']['change_protocol'] = false;
$conf['server']['change_smtphost'] = false;
$conf['server']['change_smtpport'] = false;
$conf['server']['server_list'] = 'none';
$conf['server']['sort_limit'] = 0;
$conf['server']['cache_folders'] = false;
$conf['server']['cache_msgbody'] = false;
$conf['mailbox']['show_attachments'] = false;
$conf['mailbox']['show_preview'] = true;
$conf['mailbox']['show_xpriority'] = false;
$conf['fetchmail']['show_account_colors'] = false;
$conf['fetchmail']['size_limit'] = 4000000;
$conf['mboxcache']['use_mboxcache'] = false;
$conf['msgsettings']['filtering']['words'] = './config/filter.txt';
$conf['msgsettings']['filtering']['replacement'] = '****';
$conf['spam']['reporting'] = false;
$conf['notspam']['reporting'] = false;
$conf['print']['add_printedby'] = false;
$conf['msg']['prepend_header'] = true;
$conf['msg']['append_trailer'] = false;
$conf['compose']['allow_receipts'] = true;
$conf['compose']['special_characters'] = true;
$conf['compose']['use_vfs'] = true;
$conf['compose']['link_all_attachments'] = false;
$conf['compose']['link_attachments_notify'] = true;
$conf['compose']['link_attachments'] = true;
$conf['compose']['attach_size_limit'] = 0;
$conf['compose']['attach_count_limit'] = 0;
$conf['compose']['reply_limit'] = 200000;
$conf['hooks']['vinfo'] = false;
$conf['hooks']['postlogin'] = false;
$conf['hooks']['postsent'] = false;
$conf['hooks']['signature'] = false;
$conf['hooks']['trailer'] = false;
$conf['hooks']['fetchmail_filter'] = false;
$conf['hooks']['mbox_redirect'] = true;
$conf['hooks']['mbox_icon'] = true;
$conf['hooks']['spam_bounce'] = false;
$conf['maillog']['use_maillog'] = true;
$conf['sentmail']['driver'] = 'none';
$conf['tasklist']['use_tasklist'] = true;
$conf['notepad']['use_notepad'] = true;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
--- NEW FILE: horde-imp-kolab.spec ---
# Versions
%define V_horde_name imp
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
%define V_day 24
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
# Package Information
Name: %{V_package}
Summary: IMP is the Internet Messaging Program.
URL: http://www.horde.org/
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: %{V_version}
Release: %{V_release}
Class: JUNK
License: GPL
Group: MAIL
Distribution: OpenPKG
# List of Sources
Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
Source1: conf.php
Source2: servers.php
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
PreReq: PEAR-Auth_SASL >= 1.0.2, horde-kolab >= 20070131, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
%description
IMP is the Internet Messaging Program.
%prep
%setup -c -q
%build
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/imp
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
cd imp/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
cp -r imp $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/imp/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
"%config(noreplace) %{l_prefix}/var/kolab/www/horde/imp/config/conf.php" \
"%config(noreplace) %{l_prefix}/var/kolab/www/horde/imp/config/servers.php"
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: servers.php ---
<?php
/**
* $Horde: imp/config/servers.php.dist,v 1.77 2006/10/10 14:13:03 jan Exp $
*
* This file is where you specify what mail servers people using your
* installation of IMP can log in to.
*
* Properties that can be set for each server:
*
* name: This is the plaintext, english name that you want displayed
* to people if you are using the drop down server list.
*
* server: The hostname of the mail server to connect to.
*
* hordeauth: If this parameter is present and true, then IMP will attempt
* to use the user's existing credentials (the username/password
* they used to log in to Horde) to log in to this source. If this
* parameter is 'full', the username will be used unmodified;
* otherwise everything after and including the first @ in the
* username will be stripped off before attempting authentication.
*
* protocol: One of the following strings:
* + 'imap/notls'
* + 'imap/ssl'
* + 'imap/tls'
* + 'pop3/notls'
* + 'pop3/ssl'
* + 'pop3/tls'
*
* If using 'pop3/*' you will connect to a POP3 mail server and
* all folder options will be automatically turned off (POP3 does
* not support folders). If you want folders (and for much
* improved performance) it is HIGHLY RECOMMENDED that IMAP should
* be used instead.
*
* NOTE: Due to limitations within PHP, IMP can only support auto-
* detection of namespace parameters with IMAP TLS connections
* (e.g 'imap/tls') if using PHP version 5.1.0 or greater.
* If using a version of PHP less than 5.1.0, the following
* options are available:
* 1. RECOMMENDED - If a secure IMAP connection is needed, use
* a direct connection to a SSL enabled IMAP port
* (e.g. 'imap/ssl').
* 2. If you absolutely must use TLS, then it is REQUIRED to
* define the 'namespace' parameter (see below).
*
* The ssl and tls options will only work if you've compiled PHP
* against a SSL-enabled version of c-client, used the
* --with-imap-ssl and --with-openssl flags when compiling PHP,
* and you have a mail server server which supports SSL.
*
* ** The test script can help automatically determine the **
* ** correct protocol value to use. See the 'Testing IMP' **
* ** section of imp/docs/INSTALL for instructions on how to **
* ** access the test script. **
*
* NOTE - If you are using a self-signed server certificate with
* either imap/ssl, imap/tls, pop3/ssl, or pop3/tls, you MUST add
* '/novalidate-cert' to the end of the protocol string. For imap,
* this would be 'imap/ssl/novalidate-cert' or
* 'imap/tls/novalidate-cert', and for pop3 it would be
* 'pop3/ssl/novalidate-cert' or 'pop3/tls/novalidate-cert'. This
* is necessary to tell c-client not to complain about the lack of
* a valid CA on the certificate.
*
* port: The port that the mail service/protocol you selected runs on.
* Default values:
* 'pop3' 110
* 'pop3s' 995
* 'imap' 143
* 'imaps' 993
*
* ** The test script can help automatically determine the **
* ** correct port value to use. See the 'Testing IMP' section **
* ** of imp/docs/INSTALL for instructions on how to access the **
* ** test script. **
*
* maildomain: What to put after the @ when sending mail. i.e. if you want
* all mail to look like 'From: user at example.com' set
* maildomain to 'example.com'. It is generally useful when
* the sending host is different from the mail receiving host. This
* will also be used to complete unqualified addresses when
* composing mail.
*
* smtphost: If specified, and $conf['mailer']['type'] is set to 'smtp',
* IMP will use this host for outbound SMTP connections. This
* value overrides any existing $conf['mailer']['params']['host']
* value at runtime.
*
* smtpport: If specified, and $conf['mailer']['type'] is set to 'smtp',
* IMP will use this port for outbound SMTP connections. This value
* overrides any existing $conf['mailer']['params']['port'] value at
* runtime.
*
* realm: ONLY USE REALM IF YOU ARE USING IMP FOR HORDE AUTHENTICATION,
* AND YOU HAVE MULTIPLE SERVERS AND USERNAMES OVERLAP BETWEEN
* THOSE SERVERS. If you only have one server, or have multiple
* servers with no username clashes, or have full user at example.com
* usernames, you DO NOT need a realm setting. If you set one, an
* '@' symbol plus the realm will be appended to the username that
* users log in to IMP with to create the username that Horde treats
* the user as. So with a realm of 'example.com', the username
* 'jane' would be treated by Horde (NOT your IMAP/POP server) as
* 'jane at example.com', and the username 'jane at example.com' would be
* treated as 'jane at example.com@example.com' - an occasion where you
* probably don't need a realm setting.
*
* preferred: Only useful if you want to use the same servers.php file
* for different machines: if the hostname of the IMP machine is
* identical to one of those in the preferred list, then the
* corresponding option in the select box will include SELECTED
* (i.e. it is selected per default). Otherwise the first entry
* in the list is selected.
*
* quota: Use this if you want to display a users quota status on various
* IMP pages. Set 'driver' equal to the mailserver and 'params'
* equal to any extra parameters needed by the driver (see the
* comments located at the top of imp/lib/Quota/[quotadriver].php
* for the parameters needed for each driver).
*
* Currently available drivers:
* false -- Disable quota checking (DEFAULT)
*
* 'command' -- Use the UNIX quota command to determine quotas
* 'courier' -- Use the Courier-IMAP server to handle quotas
* You must be connecting to a Courier-IMAP server
* to use this driver
* 'cyrus' -- Use the Cyrus IMAP server to handle quotas
* You must be connecting to a Cyrus IMAP server
* to use this driver
* 'logfile' -- Allow quotas on servers where IMAP Quota
* commands are not supported, but quota info
* appears in the servers messages log for the IMAP
* server.
* 'mdaemon' -- Use Mdaemon servers to handle quotas
* 'mercury32' -- Use Mercury/32 servers to handle quotas
* 'sql' -- Use arbitrary SQL queries to handle quotas
*
* admin: Use this if you want to enable mailbox management for administrators
* via Horde's user administration interface. The mailbox management
* gets enabled if you let IMP handle the Horde authentication with the
* 'application' authentication driver. Your IMAP server needs to
* support mailbox management via IMAP commands.
* Do not define this value if you do not want mailbox management.
*
* acl: Use this if you want to use Access Control Lists (folder sharing)
* Set 'driver' equal to the type of ACL your server supports and
* 'params' to an array containing any additional parameters the
* driver needs. Not all IMAP servers currently support this
* feature.
*
* At present the only drivers supported are 'rfc2086' and 'rfc4314' (in
* Horde 3.1+), neither of which require any parameters.
*
* SECURITY NOTE: If you do not have the PEAR Auth_SASL module
* installed, the 'rfc2086' driver will send user passwords to the
* IMAP server in plain text when retrieving ACLs.
*
*
* *** The following options should NOT be set unless you REALLY know what ***
* *** you are doing! FOR MOST PEOPLE, AUTO-DETECTION OF THESE PARAMETERS ***
* *** (the default if the parameters are not set) SHOULD BE USED! ***
*
* namespace: The list of namespaces that exist on the server. This entry
* must be an array. Example:
* 'namespace' => array('#shared/', '#news/', '#ftp/', '#public/')
* This parameter must be set if using a TLS connection.
* Additionally, this parameter may be set if not using a TLS
* connection and you want to allow access to namespaces that may
* not be publicly advertised by the IMAP server (see RFC
* 2342 [3]). These additional namespaces will be added to the list
* of available namespaces returned by the server.
*
* imap_config: Manually set IMAP server configuration information. Please see
* http://wiki.horde.org/ImpImapConfig for information on this
* parameter. THIS PARAMETER IS NOT OFFICIALLY SUPPORTED BY THE
* HORDE PROJECT. This entry must be an array with the following
* elements:
* 'children' - (boolean) Whether the IMAP server supports the
* CHILDREN command.
* 'namespace' - (array) The namespace configuration of the
* server. See the return from
* IMAP_Client::namespace() (located in
* imp/lib/IMAP/Client.php) for the structure of
* this array.
* 'search_charset' - (array) A list of charsets the IMAP server
* supports for searches.
*
* timeout: Manually set server timeouts. This option only works with PHP >=
* 4.3.3. This entry must be an array with the following possible
* elements (if an element is missing, the default value is used):
* IMAP_OPENTIMEOUT - (integer) The timeout for open actions.
* IMAP_READTIMEOUT - (integer) The timeout for read actions.
* IMAP_WRITETIMEOUT - (integer) The timeout for write actions.
* IMAP_CLOSETIMEOUT - (integer) The timeout for close actions.
*
* login_tries: Manually set the number of login tries we make to the server.
* The PHP imap_open() function will try to login 3 times to a
* server before failing. This value indicates the number of
* times we call imap_open() before IMP fails (we pause one second
* between imap_open() calls). The default value is 3 (meaning IMP
* may attempt to login to the server 9 times). If you have a
* mail server that will lock out an account if a certain number
* of incorrect login attempts occur within a certain period of
* time, you may want to set this to a lower value. The minimum
* value for this setting is 1.
*/
/* Any entries whose key value ('foo' in $servers['foo']) begin with '_'
* (an underscore character) will be treated as prompts, and you won't be
* able to log in to them. The only property these entries need is 'name'.
* This lets you put labels in the list, like this example: */
$servers['_prompt'] = array(
'name' => _("Choose a mail server:")
);
if ($GLOBALS['conf']['kolab']['enabled']) {
require_once 'Horde/Kolab.php';
if (!is_callable('Kolab', 'getServer')) {
$server = $GLOBALS['conf']['kolab']['imap']['server'];
} else {
$server = Kolab::getServer('imap');
}
$servers['kolab'] = array(
'name' => 'Kolab Cyrus IMAP Server',
'server' => $server,
'hordeauth' => 'full',
'protocol' => 'imap/notls/novalidate-cert',
'port' => $GLOBALS['conf']['kolab']['imap']['port'],
'maildomain' => $GLOBALS['conf']['kolab']['imap']['maildomain'],
'realm' => '',
'preferred' => '',
'quota' => array(
'driver' => 'cyrus',
'params' => array(),
),
'acl' => array(
'driver' => 'rfc2086',
),
);
}
From cvs at kolab.org Fri May 25 12:56:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 12:56:44 +0200 (CEST)
Subject: gunnar: server/horde-turba - New directory
Message-ID: <20070525105644.85013617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-turba
In directory doto:/tmp/cvs-serv16758/horde-turba
Log Message:
Directory /kolabrepository/server/horde-turba added to the repository
From cvs at kolab.org Fri May 25 14:07:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:07:19 +0200 (CEST)
Subject: gunnar: server/horde-turba Makefile, NONE, 1.1 conf.php, NONE,
1.1 config-sources.php.dist.patch, NONE,
1.1 horde-turba-kolab.spec, NONE, 1.1 lib-Driver-ldap.php.patch,
NONE, 1.1 lib-Turba.php.patch, NONE, 1.1 lib-base.php.patch,
NONE, 1.1 sources.php, NONE, 1.1
Message-ID: <20070525120719.5001E617E72@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-turba
In directory doto:/tmp/cvs-serv18619
Added Files:
Makefile conf.php config-sources.php.dist.patch
horde-turba-kolab.spec lib-Driver-ldap.php.patch
lib-Turba.php.patch lib-base.php.patch sources.php
Log Message:
The horde-turba package.
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = ${YEAR}${MONTH}${DAY}
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
if [ -n "$(PATCHES)" ]; then \
for PATCH in $(PATCHES); \
do \
cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(TEMPLATES)" ]; then \
for TEMPLATE in $(TEMPLATES); \
do \
cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(CONFIGS)" ]; then \
for CONFIG in $(CONFIGS); \
do \
cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE); \
done; \
fi
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
--- NEW FILE: conf.php ---
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
// $Horde: turba/config/conf.xml,v 1.20 2006/05/09 14:22:18 jan Exp $
$conf['menu']['import_export'] = true;
$conf['menu']['apps'] = array();
$conf['client']['addressbook'] = 'kolab_local';
$conf['shares']['source'] = 'kolab';
$conf['comments']['allow'] = true;
$conf['documents']['type'] = 'horde';
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
--- NEW FILE: config-sources.php.dist.patch ---
Index: config/sources.php.dist
===================================================================
RCS file: /repository/turba/config/sources.php.dist,v
retrieving revision 1.166
diff -u -B -r1.166 sources.php.dist
--- config/sources.php.dist 23 May 2007 22:08:54 -0000 1.166
+++ config/sources.php.dist 25 May 2007 11:01:12 -0000
@@ -736,6 +736,7 @@
'version' => 3,
'bind_dn' => '',
'bind_password' => '',
+ 'read_only' => true,
),
'map' => array(
'__key' => 'dn',
--- NEW FILE: horde-turba-kolab.spec ---
# Versions
%define V_horde_name turba
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
%define V_day 24
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
# Package Information
Name: %{V_package}
Summary: Turba is the Horde contact management application.
URL: http://www.horde.org/
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: %{V_version}
Release: %{V_release}
Class: JUNK
License: GPL
Group: MAIL
Distribution: OpenPKG
# List of Sources
Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
Source1: conf.php
Source2: sources.php
##################################################
# PATCH COMMENT
#
# Check if this can be integrated upstream
Patch0: lib-Turba.php.patch
##################################################
# PATCH COMMENT
#
# This is required until the Horde::Perms package
# has been rewritten so that it does not use
# the Horde::DataTree module anymore
Patch1: config-sources.php.dist.patch
Patch2: lib-Driver-ldap.php.patch
##################################################
# PATCH COMMENT
#
# This can be omitted once Turba uses the generic
# Share driver again.
# See http://bugs.horde.org/ticket/?id=4960
Patch3: lib-base.php.patch
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
PreReq: horde-kolab >= 20070131, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
%description
Turba is the Horde contact management application. It is a production
level address book, and makes heavy use of the Horde framework to
provide integration with IMP and other Horde applications.
Turba is a complete basic contact management application. SQL, LDAP,
IMSP, Kolab, and Horde Preferences backends are available and are well
tested. You can define the fields in your address books in a very
flexible way, just by changing the config files. You can import/export
from/to Pine, Mulberry, CSV, TSV, and vCard contacts. You can create
distribution lists from your addressbooks, which are handled
transparently by IMP and other Horde applications. You can share
address books with other users. And there are Horde API functions to
add and search for contacts.
%prep
%setup -c -q
cd %{V_horde_name}
%patch -p0 -P 0
%patch -p0 -P 1
%patch -p0 -P 2
%patch -p0 -P 3
cd ..
%build
%install
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
cd %{V_horde_name}/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php' \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/sources.php'
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: lib-Driver-ldap.php.patch ---
Index: lib/Driver/ldap.php
===================================================================
RCS file: /repository/turba/lib/Driver/ldap.php,v
retrieving revision 1.87
diff -u -B -r1.87 ldap.php
--- lib/Driver/ldap.php 4 Jan 2007 05:08:59 -0000 1.87
+++ lib/Driver/ldap.php 25 May 2007 11:02:09 -0000
@@ -54,6 +54,9 @@
if (empty($params['deref'])) {
$params['deref'] = LDAP_DEREF_NEVER;
}
+ if (empty($params['read_only'])) {
+ $params['read_only'] = false;
+ }
parent::Turba_Driver($params);
}
@@ -749,4 +752,25 @@
return $dn;
}
+ /**
+ * Checks if the current user has the requested permission
+ * on this source.
+ *
+ * @param integer $perm The permission to check for.
+ *
+ * @return boolean true if user has permission, false otherwise.
+ */
+ function hasPermission($perm)
+ {
+ if ($this->usingShares || $this->_params['read_only'] === false) {
+ return parent::hasPermission($perm);
+ } else {
+ switch ($perm) {
+ case PERMS_EDIT: return false;
+ case PERMS_DELETE: return false;
+ default: return parent::hasPermission($perm);
+ }
+ }
+ }
+
}
--- NEW FILE: lib-Turba.php.patch ---
Index: lib/Turba.php
===================================================================
RCS file: /repository/turba/lib/Turba.php,v
retrieving revision 1.121
diff -u -B -r1.121 Turba.php
--- lib/Turba.php 12 May 2007 14:58:12 -0000 1.121
+++ lib/Turba.php 25 May 2007 11:01:42 -0000
@@ -332,14 +332,13 @@
} else {
$source = $in;
}
- $srcConfig = $GLOBALS['cfgSources'][$source];
if (!$perms->exists('turba:sources:' . $in)) {
// Assume we have permissions if it's not explicitly
// set. If this is a shared addressbook, the only
// perms we'd be checking are the extended
// permissions.
return true;
- } elseif ((empty($srcConfig['use_shares'])) &&
+ } elseif ((empty($GLOBALS['cfgSources'][$source]['use_shares'])) &&
($source === $in)) {
// Using Horde_Perms AND checking source level permsissions
return $perms->hasPermission('turba:sources:' . $in, $userID,
--- NEW FILE: lib-base.php.patch ---
Index: lib/base.php
===================================================================
RCS file: /repository/turba/lib/base.php,v
retrieving revision 1.84
diff -u -B -r1.84 base.php
--- lib/base.php 28 Feb 2007 19:16:12 -0000 1.84
+++ lib/base.php 25 May 2007 11:01:51 -0000
@@ -51,7 +51,12 @@
// Turba_Share and Turba_VBook::
require_once TURBA_BASE . '/lib/Share.php';
require_once TURBA_BASE . '/lib/VBook.php';
-$GLOBALS['turba_shares'] = &Turba_Share::singleton();
+if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
+ require_once 'Horde/Share.php';
+ $GLOBALS['turba_shares'] = &Horde_Share::singleton($registry->getApp());
+} else {
+ $GLOBALS['turba_shares'] = &Turba_Share::singleton();
+}
// See if any of our sources are configured to use Turba_Share.
$haveShare = false;
@@ -61,9 +66,6 @@
$_SESSION['turba']['has_share'] = true;
}
}
-if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
- $haveShare = true;
-}
if ($haveShare) {
$GLOBALS['cfgSources'] = Turba::getConfigFromShares($cfgSources);
} else {
--- NEW FILE: sources.php ---
<?php
/**
* $Horde: turba/config/sources.php.dist,v 1.166 2007/05/23 22:08:54 wrobel Exp $
*
* This file is where you specify the sources of contacts available to users
* at your installation. It contains a large number of EXAMPLES. Please
* remove or comment out those examples that YOU DON'T NEED. There are a
* number of properties that you can set for each server, including:
*
* title: This is the common (user-visible) name that you want displayed
* in the contact source drop-down box.
*
* type: The types 'ldap', 'sql', 'imsp' and 'prefs' are currently
* supported. Preferences-based address books are not intended
* for production installs unless you really know what you're
* doing - they are not searchable, and they won't scale well if
* a user has a large number of entries.
*
* params: These are the connection parameters specific to the contact
* source. See below for examples of how to set these.
*
* Special params settings:
*
* charset: The character set that the backend stores data in. Many
* LDAP servers use utf-8. Database servers typically use
* iso-8859-1.
*
* tls: Only applies to LDAP servers. If true, then try to use a
* TLS connection to the server.
*
* scope: Only applies to LDAP servers. Can be set to 'one' to
* search one level of the LDAP directory, or 'sub' to search
* all levels. 'one' will work for most setups and should be
* much faster. However we default to 'sub' for backwards
* compatibility.
*
* checkrequired: Only applies to LDAP servers. If present, this value causes
* the driver to consult the LDAP schema for any attributes
* that are required by the given objectclass(es). Required
* attributes will be provided automatically if the
* 'checkrequired_string' parameter is present.
* *NOTE* You must have the Net_LDAP PEAR library installed
* for this to work.
*
* checksyntax: Only applies to LDAP servers. If present, this value causes
* the driver to inspect the LDAP schema for particular
* attributes by the type defined in the corresponding schema
* *NOTE* You must have the Net_LDAP PEAR library installed
* for this to work.
*
* deref: Only applies to LDAP servers. If set, should be one of:
* LDAP_DEREF_NEVER
* LDAP_DEREF_SEARCHING
* LDAP_DEREF_FINDING
* LDAP_DEREF_ALWAYS
* This tells the LDAP server when to dereference
* aliases. See http://www.php.net/ldap for more
* information.
*
* dn: Only applies to LDAP servers. Defines the list of LDAP
* attributes that build a valid DN.
*
* objectclass: Only applies to LDAP servers. Defines a list of
* objectclasses that the LDAP object must be a member of.
*
* filter: Filter helps to filter your result based on certain
* condition in SQL and LDAP backends. A filter can be
* specified to avoid some unwanted data. For example, if the
* source is an external sql database, to select records with
* the delete flag = 0:
* 'filter' = 'deleted=0'
*
* map: This is a list of mappings from the Turba attribute names
* (on the left) to the attribute names by which they are known
* in this contact source (on the right). Turba also supports
* composite fields. A composite field is defined by mapping
* the field name to an array containing a list of component
* fields and a format string (similar to a printf() format
* string). 'attribute' defines where the composed value
* is saved, and can be left out. Here is an example:
* ...
* 'name' => array('fields' => array('firstname', 'lastname'),
* 'format' => '%s %s',
* 'attribute' => 'object_name'),
* 'firstname' => 'object_firstname',
* 'lastname' => 'object_lastname',
* ...
*
* Standard Turba attributes are:
* __key : A backend-specific ID for the entry (any value
* as long as it is unique inside that source;
* required)
* __uid : Globally unique ID of the entry (used for
* synchronizing and must be able to be set to any
* value)
* __owner : User name of the contact's owner
* __type : Either 'Object' or 'Group'
* __members : Serialized PHP array with list of Group members.
* More Turba attributes are defined in config/attributes.php.
*
* tabs: All fields can be grouped into tabs with this optional entry.
* This list is multidimensional hash, the keys are the tab
* titles.
* Here is an example:
* 'tabs' => array(
* 'Names' => array('firstname', 'lastname', 'alias'),
* 'Addresses' => array('homeAddress', 'workAddress')
* );
*
* search: A list of Turba attribute names that can be searched for this
* source.
*
* strict: A list of native field/attribute names that must always be
* matched exactly in a search.
*
* export: If set to true, this source will appear on the Export menu,
* allowing users to export the contacts to a CSV (etc.) file.
*
* browse: If set to true, this source will be browseable via the Browse
* menu item, and empty searches against the source will return
* all contacts.
*
* use_shares: If this is present and true, Turba_Share functionality will
* be enabled for this source - allowing users to share their
* personal address books as well as to create new ones. Since
* Turba only supports having one backend configured for
* creating new shares, use the 'shares' configuration option to
* specify which backend will be used for creating new shares.
* All permission checking will be done against Turba_Share, but
* note that any 'extended' permissions (such as max_contacts)
* will still be enforced. Also note that the backend driver
* must have support for using this. Currently SQL and IMSP.
*
* Here are some example configurations:
*/
/* Begin Kolab sources. */
if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
require_once 'Horde/Kolab.php';
if (!is_callable('Kolab', 'getServer')) {
$server = $GLOBALS['conf']['kolab']['ldap']['server'];
} else {
$server = Kolab::getServer('ldap');
}
/* A global address book for a Kolab Server. This is typically a
* read-only public directory, stored in the default Kolab LDAP server.
* The user accessing this should have read permissions to the shared
* directory in LDAP. */
$cfgSources['kolab_global'] = array(
'title' => _("Global Address Book"),
'type' => 'ldap',
'params' => array(
'server' => $server,
'port' => $GLOBALS['conf']['kolab']['ldap']['port'],
'tls' => false,
'root' => $GLOBALS['conf']['kolab']['ldap']['basedn'],
'sizelimit' => 200,
'dn' => array('cn'),
'objectclass' => array(
'inetOrgPerson'
),
'scope' => 'one',
'charset' => 'utf-8',
'version' => 3,
'bind_dn' => '',
'bind_password' => '',
'read_only' => true,
),
'map' => array(
'__key' => 'dn',
'name' => 'cn',
'firstname' => 'givenName',
'lastname' => 'sn',
'email' => 'mail',
'alias' => 'alias',
'title' => 'title',
'company' => 'o',
'workStreet' => 'street',
'workCity' => 'l',
'workProvince' => 'st',
'workPostalCode' => 'postalCode',
'workCountry' => 'c',
'homePhone' => 'homePhone',
'workPhone' => 'telephoneNumber',
'cellPhone' => 'mobile',
'fax' => 'fax',
'notes' => 'description',
'freebusyUrl' => 'kolabHomeServer',
),
'search' => array(
'name',
'firstname',
'lastname',
'email',
'title',
'company',
'workAddress',
'workCity',
'workProvince',
'workPostalCode',
'workCountry',
'homePhone',
'workPhone',
'cellPhone',
'fax',
'notes',
),
'strict' => array(
'dn',
),
'export' => true,
'browse' => true,
);
/**
* The local address books for a Kolab user. These are stored in specially
* flagged contact folder within the users Cyrus IMAP mailbox.
*/
$cfgSources['kolab'] = array(
'title' => _("Contacts"),
'type' => 'kolab',
'params' => array(
'charset' => 'utf-8',
),
'map' => array(
'__key' => 'uid',
'name' => 'full-name',
'firstname' => 'given-name',
'lastname' => 'last-name',
'title' => 'job-title',
'company' => 'organization',
'notes' => 'body',
'website' => 'web-page',
'nickname' => 'nick-name',
'email1' => 'email1',
'email2' => 'email2',
'email3' => 'email3',
'homePhone' => 'phone-home1',
'workPhone' => 'phone-business1',
'cellPhone' => 'phone-mobile',
'fax' => 'phone-businessfax',
'workStreet' => 'addr-business-street',
'workCity' => 'addr-business-locality',
'workProvince' => 'addr-business-region',
'workPostalCode' => 'addr-business-postal-code',
'workCountry' => 'addr-business-country',
'homeStreet' => 'addr-home-street',
'homeCity' => 'addr-home-locality',
'homeProvince' => 'addr-home-region',
'homePostalCode' => 'addr-home-postal-code',
'homeCountry' => 'addr-home-country',
),
'search' => array(
'name',
'firstname',
'lastname',
'email1',
'email2',
'email3',
'title',
'company',
'notes',
'homePhone',
'workPhone',
'cellPhone',
'fax',
'workStreet',
'workCity',
'workProvince',
'workPostalCode',
'workCountry',
'homeStreet',
'homeCity',
'homeProvince',
'homePostalCode',
'homeCountry',
'website',
'nickname'
),
'strict' => array(
'uid',
),
'export' => true,
'browse' => true,
'use_shares' => true,
'shares_only' => true,
);
}
/* End Kolab sources. */
From cvs at kolab.org Fri May 25 14:08:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:08:02 +0200 (CEST)
Subject: gunnar: server/horde-imp horde-imp-kolab.spec,1.1,1.2
Message-ID: <20070525120802.61EFA617E72@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-imp
In directory doto:/tmp/cvs-serv18668
Modified Files:
horde-imp-kolab.spec
Log Message:
Minor fixes to the imp package.
Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-imp-kolab.spec 25 May 2007 10:55:37 -0000 1.1
+++ horde-imp-kolab.spec 25 May 2007 12:08:00 -0000 1.2
@@ -43,21 +43,19 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
-
- %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/imp
+ %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
- cd imp/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
+ cd %{V_horde_name}/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
- cp -r imp $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
+ cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
- $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/imp/config/
+ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- "%config(noreplace) %{l_prefix}/var/kolab/www/horde/imp/config/conf.php" \
- "%config(noreplace) %{l_prefix}/var/kolab/www/horde/imp/config/servers.php"
+ "%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php" \
+ "%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/servers.php"
%clean
rm -rf $RPM_BUILD_ROOT
From cvs at kolab.org Fri May 25 14:08:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:08:27 +0200 (CEST)
Subject: gunnar: server/horde-mnemo - New directory
Message-ID: <20070525120827.39D48617E74@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-mnemo
In directory doto:/tmp/cvs-serv18679/horde-mnemo
Log Message:
Directory /kolabrepository/server/horde-mnemo added to the repository
From cvs at kolab.org Fri May 25 14:08:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:08:27 +0200 (CEST)
Subject: gunnar: server/horde-kronolith - New directory
Message-ID: <20070525120827.3677C617E73@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-kronolith
In directory doto:/tmp/cvs-serv18679/horde-kronolith
Log Message:
Directory /kolabrepository/server/horde-kronolith added to the repository
From cvs at kolab.org Fri May 25 14:31:39 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:31:39 +0200 (CEST)
Subject: gunnar: server/horde-turba sources.php,1.1,1.2
Message-ID: <20070525123139.6B8D7617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-turba
In directory doto:/tmp/cvs-serv19029
Modified Files:
sources.php
Log Message:
Fixed turba configuration.
Index: sources.php
===================================================================
RCS file: /kolabrepository/server/horde-turba/sources.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sources.php 25 May 2007 12:07:17 -0000 1.1
+++ sources.php 25 May 2007 12:31:37 -0000 1.2
@@ -236,9 +236,7 @@
'notes' => 'body',
'website' => 'web-page',
'nickname' => 'nick-name',
- 'email1' => 'email1',
- 'email2' => 'email2',
- 'email3' => 'email3',
+ 'emails' => 'emails',
'homePhone' => 'phone-home1',
'workPhone' => 'phone-business1',
'cellPhone' => 'phone-mobile',
@@ -258,9 +256,7 @@
'name',
'firstname',
'lastname',
- 'email1',
- 'email2',
- 'email3',
+ 'emails',
'title',
'company',
'notes',
From cvs at kolab.org Fri May 25 14:45:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:45:22 +0200 (CEST)
Subject: gunnar: server/horde-kronolith Makefile, NONE, 1.1 conf.php, NONE,
1.1 horde-kronolith-kolab-conf.template, NONE,
1.1 horde-kronolith-kolab.spec, NONE, 1.1
Message-ID: <20070525124522.84295617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-kronolith
In directory doto:/tmp/cvs-serv19302
Added Files:
Makefile conf.php horde-kronolith-kolab-conf.template
horde-kronolith-kolab.spec
Log Message:
horde-kronolith package.
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = ${YEAR}${MONTH}${DAY}
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
if [ -n "$(PATCHES)" ]; then \
for PATCH in $(PATCHES); \
do \
cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(TEMPLATES)" ]; then \
for TEMPLATE in $(TEMPLATES); \
do \
cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(CONFIGS)" ]; then \
for CONFIG in $(CONFIGS); \
do \
cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE); \
done; \
fi
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
--- NEW FILE: conf.php ---
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
// $Horde: kronolith/config/conf.xml,v 1.19 2006/11/25 00:13:41 jan Exp $
$conf['calendar']['driver'] = 'kolab';
$conf['storage']['default_domain'] = '';
$conf['storage']['freebusy']['protocol'] = 'https';
$conf['storage']['freebusy']['port'] = 443;
$conf['storage']['driver'] = 'kolab';
$conf['metadata']['keywords'] = false;
$conf['reminder']['server_name'] = '';
$conf['reminder']['from_addr'] = '';
$conf['autoshare']['shareperms'] = 'none';
$conf['holidays']['enable'] = true;
$conf['menu']['print'] = true;
$conf['menu']['import_export'] = true;
$conf['menu']['apps'] = array();
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
if (file_exists(dirname(__FILE__) . '/kolab.php')) {
require_once(dirname(__FILE__) . '/kolab.php');
}
--- NEW FILE: horde-kronolith-kolab-conf.template ---
KOLAB_META_START
TARGET=/kolab/var/kolab/www/horde/kronolith/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=kolab-n:kolab-n
KOLAB_META_END
<?php
$conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
$conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
$conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
?>
--- NEW FILE: horde-kronolith-kolab.spec ---
# Versions
%define V_horde_name kronolith
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
%define V_day 24
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
# Package Information
Name: %{V_package}
Summary: Kronolith is the Horde calendar application.
URL: http://www.horde.org/
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: %{V_version}
Release: %{V_release}
Class: JUNK
License: GPL
Group: MAIL
Distribution: OpenPKG
# List of Sources
Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
Source1: horde-kronolith-kolab-conf.template
Source2: conf.php
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
PreReq: horde-kolab >= 20070131, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
%description
Kronolith is the Horde calendar application. It provides a stable and
featureful individual calendar system for every Horde user, with
integrated collaboration/scheduling features. It makes extensive use
of the Horde Framework to provide integration with other applications.
%prep
%setup -c -q
%build
%install
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
cd %{V_horde_name}/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2} \
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kronolith-kolab-conf.template' \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php'
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
From cvs at kolab.org Fri May 25 14:51:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:51:24 +0200 (CEST)
Subject: gunnar: server/horde-mnemo Makefile, NONE, 1.1 conf.php, NONE,
1.1 horde-mnemo-kolab.spec, NONE, 1.1
Message-ID: <20070525125124.7AEDB617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-mnemo
In directory doto:/tmp/cvs-serv19426
Added Files:
Makefile conf.php horde-mnemo-kolab.spec
Log Message:
The horde-mnemo package.
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = ${YEAR}${MONTH}${DAY}
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
if [ -n "$(PATCHES)" ]; then \
for PATCH in $(PATCHES); \
do \
cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(TEMPLATES)" ]; then \
for TEMPLATE in $(TEMPLATES); \
do \
cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(CONFIGS)" ]; then \
for CONFIG in $(CONFIGS); \
do \
cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE); \
done; \
fi
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
--- NEW FILE: conf.php ---
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
// $Horde: mnemo/config/conf.xml,v 1.19 2006/12/14 11:28:24 jan Exp $
$conf['storage']['driver'] = 'kolab';
$conf['menu']['print'] = true;
$conf['menu']['import_export'] = true;
$conf['menu']['apps'] = array();
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
--- NEW FILE: horde-mnemo-kolab.spec ---
# Versions
%define V_horde_name mnemo
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
%define V_day 24
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
# Package Information
Name: %{V_package}
Summary: Mnemo is the Horde notes and memos application.
URL: http://www.horde.org/
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: %{V_version}
Release: %{V_release}
Class: JUNK
License: GPL
Group: MAIL
Distribution: OpenPKG
# List of Sources
Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
Source1: conf.php
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
PreReq: horde-kolab >= 20070131, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
%description
Mnemo is the Horde notes and memos application. It lets users keep
free-text notes and other bits of information which doesnt fit as a
contact, a todo item, an event, etc. It is very similar in
functionality to the Palm Memo application.
%prep
%setup -c -q
%build
%install
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
cd %{V_horde_name}/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php'
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
From cvs at kolab.org Fri May 25 14:52:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:52:12 +0200 (CEST)
Subject: gunnar: server/horde-ingo - New directory
Message-ID: <20070525125212.46238617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-ingo
In directory doto:/tmp/cvs-serv19477/horde-ingo
Log Message:
Directory /kolabrepository/server/horde-ingo added to the repository
From cvs at kolab.org Fri May 25 14:52:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:52:12 +0200 (CEST)
Subject: gunnar: server/horde-passwd - New directory
Message-ID: <20070525125212.4CB7C617E73@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-passwd
In directory doto:/tmp/cvs-serv19477/horde-passwd
Log Message:
Directory /kolabrepository/server/horde-passwd added to the repository
From cvs at kolab.org Fri May 25 14:52:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:52:12 +0200 (CEST)
Subject: gunnar: server/horde-nag - New directory
Message-ID: <20070525125212.4991E617E72@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-nag
In directory doto:/tmp/cvs-serv19477/horde-nag
Log Message:
Directory /kolabrepository/server/horde-nag added to the repository
From cvs at kolab.org Fri May 25 14:59:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 14:59:16 +0200 (CEST)
Subject: gunnar: server/horde-passwd Makefile, NONE, 1.1 conf.php, NONE,
1.1 horde-passwd-kolab.spec, NONE, 1.1
Message-ID: <20070525125916.DAB63617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-passwd
In directory doto:/tmp/cvs-serv19682
Added Files:
Makefile conf.php horde-passwd-kolab.spec
Log Message:
The horde passwd module.
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = ${YEAR}${MONTH}${DAY}
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
if [ -n "$(PATCHES)" ]; then \
for PATCH in $(PATCHES); \
do \
cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(TEMPLATES)" ]; then \
for TEMPLATE in $(TEMPLATES); \
do \
cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(CONFIGS)" ]; then \
for CONFIG in $(CONFIGS); \
do \
cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE); \
done; \
fi
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
--- NEW FILE: conf.php ---
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
// $Horde: passwd/config/conf.xml,v 1.12 2005/10/09 14:48:58 jan Exp $
$conf['menu']['apps'] = array();
$conf['backend']['backend_list'] = 'hidden';
$conf['user']['change'] = true;
$conf['user']['refused'] = array('root', 'bin', 'daemon', 'adm', 'lp', 'shutdown', 'halt', 'uucp', 'ftp', 'anonymous', 'nobody', 'httpd', 'operator', 'guest', 'diginext', 'bind', 'cyrus', 'courier', 'games', 'kmem', 'mailnull', 'man', 'mysql', 'news', 'postfix', 'sshd', 'tty', 'www');
$conf['password']['strengthtests'] = true;
$conf['hooks']['full_name'] = true;
$conf['hooks']['default_username'] = false;
$conf['hooks']['username'] = false;
$conf['hooks']['userdn'] = false;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
--- NEW FILE: horde-passwd-kolab.spec ---
# Versions
%define V_horde_name passwd
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
%define V_day 24
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
# Package Information
Name: %{V_package}
Summary: Passwd is the Horde password changing application.
URL: http://www.horde.org/
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: %{V_version}
Release: %{V_release}
Class: JUNK
License: GPL
Group: MAIL
Distribution: OpenPKG
# List of Sources
Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
Source1: conf.php
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
PreReq: horde-kolab >= 20070131, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
%description
Passwd is the Horde password changing application. While it has been
released and is in production use at many sites, it is also under
heavy development in an effort to expand and improve the module.
Right now, Passwd provides fairly complete support for changing
passwords via Poppassd, LDAP, Unix expect scripts, the Unix smbpasswd
command for SMB/CIFS passwords, Kolab, ADSI, Pine, Serv-U FTP,
VMailMgr, vpopmail, and SQL passwords.
%prep
%setup -c -q
%build
%install
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
cd %{V_horde_name}/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php'
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
From cvs at kolab.org Fri May 25 15:06:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 15:06:20 +0200 (CEST)
Subject: gunnar: server/horde-imp servers.php,1.1,1.2
Message-ID: <20070525130620.30728617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-imp
In directory doto:/tmp/cvs-serv20079
Modified Files:
servers.php
Log Message:
Fixed the servers.php config for imp.
Index: servers.php
===================================================================
RCS file: /kolabrepository/server/horde-imp/servers.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- servers.php 25 May 2007 10:55:37 -0000 1.1
+++ servers.php 25 May 2007 13:06:18 -0000 1.2
@@ -206,14 +206,6 @@
* value for this setting is 1.
*/
-/* Any entries whose key value ('foo' in $servers['foo']) begin with '_'
- * (an underscore character) will be treated as prompts, and you won't be
- * able to log in to them. The only property these entries need is 'name'.
- * This lets you put labels in the list, like this example: */
-$servers['_prompt'] = array(
- 'name' => _("Choose a mail server:")
-);
-
if ($GLOBALS['conf']['kolab']['enabled']) {
require_once 'Horde/Kolab.php';
@@ -233,7 +225,7 @@
'realm' => '',
'preferred' => '',
'quota' => array(
- 'driver' => 'cyrus',
+ 'driver' => 'imap',
'params' => array(),
),
'acl' => array(
From cvs at kolab.org Fri May 25 15:06:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 15:06:46 +0200 (CEST)
Subject: gunnar: server/horde-ingo Makefile, NONE, 1.1 backends.php, NONE,
1.1 conf.php, NONE, 1.1 horde-ingo-kolab.spec, NONE, 1.1
Message-ID: <20070525130646.425C4617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-ingo
In directory doto:/tmp/cvs-serv20111
Added Files:
Makefile backends.php conf.php horde-ingo-kolab.spec
Log Message:
The horde ingo package.
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = ${YEAR}${MONTH}${DAY}
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
if [ -n "$(PATCHES)" ]; then \
for PATCH in $(PATCHES); \
do \
cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(TEMPLATES)" ]; then \
for TEMPLATE in $(TEMPLATES); \
do \
cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(CONFIGS)" ]; then \
for CONFIG in $(CONFIGS); \
do \
cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE); \
done; \
fi
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
--- NEW FILE: backends.php ---
<?php
/**
* $Horde: ingo/config/backends.php.dist,v 1.20.8.4 2006/02/02 22:57:31 jan Exp $
*
* Ingo works purely on a preferred mechanism for server selection. There are
* a number of properties that you can set for each backend:
*
* driver: The Ingo_Driver driver to use to get the script to the
* backend server. Valid options:
* 'null' -- No backend server
* 'timsieved' -- Cyrus timsieved server
* 'vfs' -- Use Horde VFS
*
* preferred: This is the field that is used to choose which server is
* used. The value for this field may be a single string or an
* array of strings containing the hostnames to use with this
* server.
*
* hordeauth: Ingo uses the current logged in username and password. If
* you want the full username at realm to be used to connect then
* set this to 'full' otherwise set this to true and just the
* username will be used to connect to the driver.
*
* params: An array containing any additional information that the
* Ingo_Driver class needs.
*
* script: The type of Ingo_Script driver this server uses.
* Valid options:
* 'imap' -- IMAP client side filtering
* 'maildrop' -- Maildrop scripts
* 'procmail' -- Procmail scripts
* 'sieve' -- Sieve scripts
*
* scriptparams: An array containing any additional information that the
* Ingo_Script driver needs.
*/
/* Kolab Example (using Sieve) */
if ($GLOBALS['conf']['kolab']['enabled']) {
$backends['kolab'] = array(
'driver' => 'timsieved',
'preferred' => '',
'hordeauth' => 'full',
'params' => array(
'hostspec' => $GLOBALS['conf']['kolab']['imap']['server'],
'logintype' => 'PLAIN',
'port' => $GLOBALS['conf']['kolab']['imap']['sieveport'],
'scriptname' => 'kmail-vacation.siv'
),
'script' => 'sieve',
'scriptparams' => array()
);
}
--- NEW FILE: conf.php ---
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
// $Horde: ingo/config/conf.xml,v 1.18 2006/10/27 13:51:42 jan Exp $
$conf['menu']['apps'] = array();
$conf['storage']['driver'] = 'prefs';
$conf['storage']['maxblacklist'] = 0;
$conf['storage']['maxwhitelist'] = 0;
$conf['rules']['userheader'] = true;
$conf['rules']['usefolderapi'] = true;
$conf['spam']['enabled'] = true;
$conf['spam']['header'] = 'X-Spam-Level';
$conf['spam']['char'] = '*';
$conf['hooks']['vacation_addresses'] = false;
$conf['hooks']['vacation_only'] = true;
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
--- NEW FILE: horde-ingo-kolab.spec ---
# Versions
%define V_horde_name ingo
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
%define V_day 24
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
# Package Information
Name: %{V_package}
Summary: Ingo, the "Email Filter Rules Manager"
URL: http://www.horde.org/
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: %{V_version}
Release: %{V_release}
Class: JUNK
License: GPL
Group: MAIL
Distribution: OpenPKG
# List of Sources
Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
Source1: conf.php
Source2: backends.php
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
PreReq: PEAR-Net_Sieve >= 1.1.5, horde-kolab >= 20070131, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
%description
Ingo, the "Email Filter Rules Manager", started as a frontend for the
Sieve filter language, and is now a generic and complete filter rule
frontend that currently is able to create Sieve, procmail, maildrop,
and IMAP filter rules. The IMAP filter driver translates the filter
rules on demand to IMAP commands, executed via PHP's IMAP extension
and has replaced IMP's internal filtering code. It is now the default
filtering agent in IMP H3 (4.x).
%prep
%setup -c -q
%build
%install
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
cd %{V_horde_name}/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php' \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/backends.php'
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
From cvs at kolab.org Fri May 25 15:10:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 25 May 2007 15:10:07 +0200 (CEST)
Subject: gunnar: server/horde-nag Makefile, NONE, 1.1 conf.php, NONE,
1.1 horde-nag-kolab.spec, NONE, 1.1
Message-ID: <20070525131007.1C2D6617E41@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-nag
In directory doto:/tmp/cvs-serv20153
Added Files:
Makefile conf.php horde-nag-kolab.spec
Log Message:
The horde-nag package.
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = ${YEAR}${MONTH}${DAY}
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
# Remove once moving to kolab cvs
PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
if [ -n "$(PATCHES)" ]; then \
for PATCH in $(PATCHES); \
do \
cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(TEMPLATES)" ]; then \
for TEMPLATE in $(TEMPLATES); \
do \
cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
done; \
fi
if [ -n "$(CONFIGS)" ]; then \
for CONFIG in $(CONFIGS); \
do \
cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE); \
done; \
fi
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
--- NEW FILE: conf.php ---
<?php
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
// $Horde: nag/config/conf.xml,v 1.26 2005/07/19 17:06:01 chuck Exp $
$conf['storage']['driver'] = 'kolab';
$conf['menu']['print'] = true;
$conf['menu']['import_export'] = true;
$conf['menu']['apps'] = array();
/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
--- NEW FILE: horde-nag-kolab.spec ---
# Versions
%define V_horde_name nag
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
%define V_day 24
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
# Package Information
Name: %{V_package}
Summary: Nag is the Horde task list application
URL: http://www.horde.org/
Packager: Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version: %{V_version}
Release: %{V_release}
Class: JUNK
License: GPL
Group: MAIL
Distribution: OpenPKG
# List of Sources
Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
Source1: conf.php
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: apache, php, php::with_pear = yes
PreReq: horde-kolab >= 20070131, apache, php, php::with_pear = yes
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
%description
Nag is the Horde task list application. It stores todo items, things
due later this week, etc. It is very similar in functionality to the
Palm ToDo application.
%prep
%setup -c -q
%build
%install
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
cd %{V_horde_name}/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php'
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
From cvs at kolab.org Mon May 28 21:24:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 May 2007 21:24:12 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
user.php.in, 1.18, 1.19
Message-ID: <20070528192412.5A295617E6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv4849/kolab-webadmin/kolab-webadmin/www/admin/user
Modified Files:
user.php.in
Log Message:
Corrected fix for 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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- user.php.in 24 May 2007 09:31:04 -0000 1.18
+++ user.php.in 28 May 2007 19:24:10 -0000 1.19
@@ -481,11 +481,15 @@
$entries['action'] = array( 'name' => 'action',
'type' => 'hidden' );
+$oc = array('top', 'inetOrgPerson','kolabInetOrgPerson');
+
if( $dn ) {
$ldap_object = $ldap->read( $dn );
if( !$ldap_object ) {
array_push($errors, sprintf(_("LDAP Error: No such dn: %s: %s"), $dn, ldap_error($ldap->connection)));
}
+ $oc = $ldap_object['objectClass'];
+ unset($oc['count']);
}
if( $auth->group() == 'user' ) {
@@ -505,6 +509,7 @@
$content = $form->outputForm();
} else {
$ldap_object = array();
+ $ldap_object['objectClass'] = $oc;
$ldap_object['sn'] = trim($_POST['sn']);
$ldap_object['cn'] = trim($_POST['givenname']).' '.$ldap_object['sn'];
$ldap_object['givenName'] = trim($_POST['givenname']);
From cvs at kolab.org Mon May 28 21:24:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 May 2007 21:24:12 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.44,1.45
Message-ID: <20070528192412.5D931617E6B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv4849/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
Corrected fix for kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ChangeLog 24 May 2007 12:06:50 -0000 1.44
+++ ChangeLog 28 May 2007 19:24:10 -0000 1.45
@@ -1,3 +1,14 @@
+2007-05-28 Gunnar Wrobel <p at rdus.de>
+
+ * 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:
+
+ Corrected fix for
+ kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
+
2007-05-24 Gunnar Wrobel <p at rdus.de>
* Makefile.am (WSKOLAB_FILES):
From cvs at kolab.org Mon May 28 21:24:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 May 2007 21:24:12 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/administrator
admin.php.in, 1.6, 1.7
Message-ID: <20070528192412.624D0617E6F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator
In directory doto:/tmp/cvs-serv4849/kolab-webadmin/kolab-webadmin/www/admin/administrator
Modified Files:
admin.php.in
Log Message:
Corrected fix for 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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- admin.php.in 24 May 2007 09:31:05 -0000 1.6
+++ admin.php.in 28 May 2007 19:24:10 -0000 1.7
@@ -163,11 +163,15 @@
$entries['action'] = array( 'name' => 'action',
'type' => 'hidden' );
+$oc = array('top', 'inetOrgPerson','kolabInetOrgPerson');
+
if( $dn ) {
$ldap_object = $ldap->read( $dn );
if( !$ldap_object ) {
array_push($errors, sprintf(_("LDAP Error: No such dn: %s: %s"), $dn, ldap_error($ldap->connection)));
}
+ $oc = $ldap_object['objectClass'];
+ unset($oc['count']);
}
$form =& new KolabForm( 'admin', 'createadmin.tpl', $entries );
@@ -185,6 +189,7 @@
} else {
debug("Process...");
$ldap_object = array();
+ $ldap_object['objectClass'] = $oc;
$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 Mon May 28 21:24:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 May 2007 21:24:12 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
domainmaintainer.php.in, 1.9, 1.10
Message-ID: <20070528192412.5EFB3617E6D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
In directory doto:/tmp/cvs-serv4849/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
Modified Files:
domainmaintainer.php.in
Log Message:
Corrected fix for 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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- domainmaintainer.php.in 24 May 2007 09:31:05 -0000 1.9
+++ domainmaintainer.php.in 28 May 2007 19:24:10 -0000 1.10
@@ -146,11 +146,15 @@
$entries['action'] = array( 'name' => 'action',
'type' => 'hidden' );
+$oc = array('top', 'inetOrgPerson','kolabInetOrgPerson');
+
if( $dn ) {
$ldap_object = $ldap->read( $dn );
if( !$ldap_object ) {
array_push($errors, sprintf( _("LDAP Error: No such dn: %s: %s"), $dn, ldap_error($ldap->connection)));
}
+ $oc = $ldap_object['objectClass'];
+ unset($oc['count']);
}
$form =& new KolabForm( 'maintainer', 'createmaintainer.tpl', $entries );
@@ -167,6 +171,7 @@
$content = $form->outputForm();
} else {
$ldap_object = array();
+ $ldap_object['objectClass'] = $oc;
$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 Mon May 28 21:24:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 May 2007 21:24:12 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
maintainer.php.in, 1.7, 1.8
Message-ID: <20070528192412.607A5617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
In directory doto:/tmp/cvs-serv4849/kolab-webadmin/kolab-webadmin/www/admin/maintainer
Modified Files:
maintainer.php.in
Log Message:
Corrected fix for 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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- maintainer.php.in 24 May 2007 09:31:05 -0000 1.7
+++ maintainer.php.in 28 May 2007 19:24:10 -0000 1.8
@@ -160,11 +160,15 @@
$entries['action'] = array( 'name' => 'action',
'type' => 'hidden' );
+$oc = array('top', 'inetOrgPerson','kolabInetOrgPerson');
+
if( $dn ) {
$ldap_object = $ldap->read( $dn );
if( !$ldap_object ) {
array_push($errors, sprintf(_("LDAP Error: No such dn: %s: %s"), $dn, ldap_error($ldap->connection)));
}
+ $oc = $ldap_object['objectClass'];
+ unset($oc['count']);
}
$form =& new KolabForm( 'maintainer', 'createmaintainer.tpl', $entries );
@@ -182,6 +186,7 @@
} else {
debug("Process...");
$ldap_object = array();
+ $ldap_object['objectClass'] = $oc;
$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 Tue May 29 17:07:08 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 17:07:08 +0200 (CEST)
Subject: gunnar: server README.webclient,NONE,1.1
Message-ID: <20070529150708.6A704617E56@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv6033
Added Files:
README.webclient
Log Message:
Add a draft readme for the horde webclient.
--- NEW FILE: README.webclient ---
== Installation on top of a running server ==
PLEASE NOTE: This is still highly experimental and may damage your
existing Kolab installation. Do NOT install these packages on a
productive machine!
This works only with the Kolab-2.1_RC1 server version!
Move into the directory where you dowloaded the Kolab source packages
and the obmtool script.
Remove the old obmtool.conf script:
rm obmtool.conf
Download the necessary Horde source packages including the new
obmtool.conf:
wget -q -r -l1 -nd --no-parent http://build.pardus.de/downloads/kolab-horde-tmp
Now run
sh obmtool kolab &> kolab-horde-build.log
as in a standard Kolab installation.
Finally configure Horde with
/kolab/sbin/kolabconf
and restart the services
/kolab/bin/openpkg rc all restart
== Full installation ==
This is can be used to get a current, full installation including
horde in a few steps:
# Remove the /kolab directoy and any sources in /tmp/kolab
rm -rf /kolab /tmp/kolab
# Get the sources
mkdir /tmp/kolab
cd /tmp/kolab
wget -q -r -l1 -nd --no-parent http://max.kde.org:8080/mirrors/ftp.kolab.org/server/beta/kolab-server-2.1-rc-1/sources/
rm obmtool.conf
wget -q -r -l1 -nd --no-parent http://build.pardus.de/downloads/kolab-horde-tmp
# Install kolab
sh obmtool kolab &> kolab-build.log
# Bootstrap Kolab
/kolab/etc/kolab/kolab_bootstrap -b
# Restart services
/kolab/bin/openpkg rc all restart
From cvs at kolab.org Tue May 29 17:07:08 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 17:07:08 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
domainmaintainer.php.in, 1.10, 1.11 index.php.in, 1.2, 1.3
Message-ID: <20070529150708.6BE8A617E58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
In directory doto:/tmp/cvs-serv6033/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
Modified Files:
domainmaintainer.php.in index.php.in
Log Message:
Add a draft readme for the horde webclient.
Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- domainmaintainer.php.in 28 May 2007 19:24:10 -0000 1.10
+++ domainmaintainer.php.in 29 May 2007 15:07:06 -0000 1.11
@@ -324,7 +324,7 @@
ldap_error($ldap->connection));
}
if( !$errors ) {
- $delete_template['kolabdeleteflag'] = 'TRUE';
+ $delete_template['kolabDeleteflag'] = 'TRUE';
if( !$ldap->deleteObject($dn)) {
array_push($errors, sprintf( _("LDAP Error: could not mark %s for deletion: %s"), $dn,
ldap_error($ldap->connection)));
Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/index.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php.in 17 May 2006 23:15:32 -0000 1.2
+++ index.php.in 29 May 2007 15:07:06 -0000 1.3
@@ -53,7 +53,7 @@
$maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'domain-maintainer' );
$filter = "(&(cn=*)(objectclass=kolabInetOrgPerson)(!(uid=manager))(sn=*))";
- $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
+ $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabDeleteflag' ));
if( $result ) {
$title = _('Manage Maintainers (').count($maintainers)._(' Maintainers)');
@@ -75,7 +75,7 @@
while( $entry ) {
$attrs = ldap_get_attributes($ldap->connection, $entry);
$dn = ldap_get_dn($ldap->connection,$entry);
- $deleted = array_key_exists('kolabdeleteflag',$attrs)?$attrs['kolabdeleteflag'][0]:"FALSE";
+ $deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
$userid = $attrs['uid'][0];
$sn = $attrs['sn'][0];
$cn = $attrs['cn'][0];
From cvs at kolab.org Tue May 29 17:07:08 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 17:07:08 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
index.php.in, 1.1, 1.2 maintainer.php.in, 1.8, 1.9
Message-ID: <20070529150708.6D44A617E68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
In directory doto:/tmp/cvs-serv6033/kolab-webadmin/kolab-webadmin/www/admin/maintainer
Modified Files:
index.php.in maintainer.php.in
Log Message:
Add a draft readme for the horde webclient.
Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/index.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php.in 5 Feb 2006 20:13:55 -0000 1.1
+++ index.php.in 29 May 2007 15:07:06 -0000 1.2
@@ -53,7 +53,7 @@
$maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' );
$filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
- $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
+ $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabDeleteflag' ));
if( $result ) {
$title = _('Manage Maintainers (').count($maintainers)._(' Maintainers)');
@@ -75,7 +75,7 @@
while( $entry ) {
$attrs = ldap_get_attributes($ldap->connection, $entry);
$dn = ldap_get_dn($ldap->connection,$entry);
- $deleted = array_key_exists('kolabdeleteflag',$attrs)?$attrs['kolabdeleteflag'][0]:"FALSE";
+ $deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
$userid = $attrs['uid'][0];
$sn = $attrs['sn'][0];
$cn = $attrs['cn'][0];
Index: maintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- maintainer.php.in 28 May 2007 19:24:10 -0000 1.8
+++ maintainer.php.in 29 May 2007 15:07:06 -0000 1.9
@@ -323,7 +323,7 @@
ldap_error($ldap->connection));
}
if( !$errors ) {
- $delete_template['kolabdeleteflag'] = 'TRUE';
+ $delete_template['kolabDeleteflag'] = 'TRUE';
if( !$ldap->deleteObject($dn)) {
array_push($errors, sprintf(_("LDAP Error: could not mark %s for deletion: %s"), $dn.
ldap_error($ldap->connection)));
From cvs at kolab.org Tue May 29 17:07:08 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 17:07:08 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/administrator
index.php.in, 1.1, 1.2
Message-ID: <20070529150708.6818F617E54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator
In directory doto:/tmp/cvs-serv6033/kolab-webadmin/kolab-webadmin/www/admin/administrator
Modified Files:
index.php.in
Log Message:
Add a draft readme for the horde webclient.
Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/index.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php.in 5 Feb 2006 20:13:55 -0000 1.1
+++ index.php.in 29 May 2007 15:07:06 -0000 1.2
@@ -53,7 +53,7 @@
$maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'admin' );
$filter = "(&(cn=*)(objectclass=inetOrgPerson)(uid=*)(sn=*))";
- $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
+ $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabDeleteflag' ));
if( $result ) {
$count = count($maintainers)-1;
@@ -76,7 +76,7 @@
while( $entry ) {
$attrs = ldap_get_attributes($ldap->connection, $entry);
$dn = ldap_get_dn($ldap->connection,$entry);
- $deleted = array_key_exists('kolabdeleteflag',$attrs)?$attrs['kolabdeleteflag'][0]:"FALSE";
+ $deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
$userid = $attrs['uid'][0];
if( $userid != 'manager' ) {
$sn = $attrs['sn'][0];
From cvs at kolab.org Tue May 29 17:12:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 17:12:25 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.121,1.122
Message-ID: <20070529151225.E1807617E56@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv6171
Modified Files:
release-notes.txt
Log Message:
Committed potential fix for kolab/issue1744 by accident with my last
commit. Probably ok, but I still need to test it. Simple typo
(kolabDeleteflag). https://www.intevation.de/roundup/kolab/issue1744
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- release-notes.txt 25 May 2007 10:16:06 -0000 1.121
+++ release-notes.txt 29 May 2007 15:12:23 -0000 1.122
@@ -49,7 +49,7 @@
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)
-
+ kolab/issue1744 (No "User Deleted, awaiting cleanup" for admins and domain maintainers)
Changes between 2.1-rc-2 and 2.1.0:
From cvs at kolab.org Tue May 29 17:12:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 17:12:25 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.45,1.46
Message-ID: <20070529151225.DD93F617E54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv6171/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
Committed potential fix for kolab/issue1744 by accident with my last
commit. Probably ok, but I still need to test it. Simple typo
(kolabDeleteflag). https://www.intevation.de/roundup/kolab/issue1744
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- ChangeLog 28 May 2007 19:24:10 -0000 1.45
+++ ChangeLog 29 May 2007 15:12:23 -0000 1.46
@@ -1,3 +1,15 @@
+2007-05-29 Gunnar Wrobel <p at rdus.de>
+
+ * www/admin/domainmaintainer/domainmaintainer.php.in:
+ * www/admin/domainmaintainer/index.php.in:
+ * www/admin/maintainer/index.php.in:
+ * www/admin/maintainer/maintainer.php.in:
+ * www/admin/administrator/index.php.in:
+
+ Committed potential fix for kolab/issue1744 by accident. Probably
+ ok, but I still need to test it. Simply typo (kolabDeleteflag).
+ https://www.intevation.de/roundup/kolab/issue1744
+
2007-05-28 Gunnar Wrobel <p at rdus.de>
* www/admin/user/user.php.in:
From cvs at kolab.org Tue May 29 17:16:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 17:16:11 +0200 (CEST)
Subject: gunnar: server obmtool-webclient.conf,NONE,1.1
Message-ID: <20070529151611.B5364617E54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv6272
Added Files:
obmtool-webclient.conf
Log Message:
Draft version of the modified obmtool.conf for the webclient packages.
--- NEW FILE: obmtool-webclient.conf ---
##
## obmtool.conf -- OpenPKG poor man's Boot, Build & Management Tool Configuration
##
## Package listing for Kolab
##
## based on Ralf S. Engelschall's "obmtool.conf -- Development Tool Configuration"
## Copyright (c) 2004-2006 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
## Copyright (c) 2003 Thomas Lotterer <thomas at lotterer.net>
##
%common
@hasfeature TAGFMT || exit # require obmtool to support TAGFMT
TMPDIR=/var/tmp # large tmp with 300MB space
URL="" # used for non-ftp://ftp.openpkg.org/ packages
USERNAME=""
for opt in $cmdargs ; do
arg=`echo "${opt}" | sed -e 's;^[^=]*=*;;'`
opt=`echo "${opt}" | sed -e 's;=.*$;;'`
case $opt in
-u|--user) USERNAME="$arg";;
--url) URL="";;
esac
done
%kolab
echo "---- boot/build ${NODE} %${CMD} ----"
kolab_version="2.1rc1";
PREFIX=/${CMD};
loc='./' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
plusloc='./'
altloc='./'
with_genuine=no
# Check for presence of libgcrypt in the host system
libgcrypt_pfx=`eval libgcrypt-config --prefix 2>/dev/null`;
if test -n "$libgcrypt_pfx" ; then
echo "libgcrypt installation in $libgcrypt_pfx detected";
echo "Please deinstall it or move libgcrypt-config away";
echo "while building Kolab"
exit -1;
fi
# start from scratch or upgrade within 2.0.x
@install ${loc}openpkg-2.5.4-2.5.4 \
--tag="kolab" \
--prefix="${PREFIX}" \
--user="${CMD}" --group="${CMD}" \
--muid="19414" --ruid="19415" --nuid="19416" \
--mgid="19414" --rgid="19415" --ngid="19416"
if test -n "$USERNAME" ; then
$PREFIX/bin/openpkg register --mode=post --user=$USERNAME
$PREFIX/bin/openpkg register --printstatus && echo "Please associate the instance now. Then RETURN to continue." && read DUMMY
fi
@install ${loc}make-3.80-2.5.0
@install ${loc}binutils-2.16.1-2.5.1
@install ${loc}gcc-4.0.2-2.5.0
@install ${loc}fsl-1.6.1-2.5.0
@install ${loc}mm-1.4.0-2.5.0
@install ${loc}perl-5.8.7-2.5.1
@install ${loc}perl-openpkg-5.8.7-2.5.0
@install ${loc}perl-conv-5.8.7-2.5.0
@install ${loc}lzo-2.01-2.5.0 # PENDING(steffen) Check if we need lzop-1.0
@install ${loc}readline-5.0.5-2.5.0
@install ${loc}sharutils-4.5.1-2.5.0
@install ${loc}ncurses-5.5.20051015-2.5.0
@install ${loc}bzip2-1.0.3-2.5.0
@install ${loc}pcre-6.4-2.5.0
@install ${loc}grep-2.5.1a-2.5.0
@install ${loc}texinfo-4.8-2.5.1
@install ${loc}diffutils-2.8.7-2.5.0
@install ${loc}gzip-1.3.5-2.5.1
@install ${loc}zlib-1.2.3-2.5.0
@install ${loc}expat-1.95.8-2.5.0
@install ${loc}perl-term-5.8.7-2.5.0
@install ${loc}perl-ds-5.8.7-2.5.0
@install ${loc}perl-stats-5.8.7-2.5.0
@install ${loc}perl-time-5.8.7-2.5.0
@install ${loc}perl-util-5.8.7-2.5.0
@install ${loc}perl-parse-5.8.7-2.5.0
@install ${loc}perl-sys-5.8.7-2.5.0
@install ${loc}openssl-0.9.8a-2.5.4
@install ${loc}perl-mail-5.8.7-2.5.0
@install ${loc}perl-crypto-5.8.7-2.5.0
@install ${loc}perl-xml-5.8.7-2.5.0
@install ${loc}perl-net-5.8.7-2.5.0
@install ${loc}perl-comp-5.8.7-2.5.0
@trigger ${loc}perl-ssl-5.8.7-2.5.0
@install ${loc}perl-www-5.8.7-2.5.1
@install ${loc}perl-dns-5.8.7-2.5.0
@trigger ${altloc}imap-2004g-2.5.0_kolab --with=annotate
@install ${loc}procmail-3.22-2.5.0
@install ${loc}db-4.3.29.0-2.5.0
@install ${altloc}openldap-2.3.29-2.20061110_kolab
@install ${loc}m4-1.4.3-2.5.0
@install ${loc}bison-2.1-2.5.0
@install ${loc}flex-2.5.31-2.5.0
@install ${loc}groff-1.19.2-2.5.0
@trigger ${loc}sasl-2.1.21-2.5.0 --with=ldap --with=login
@install ${loc}getopt-20051005-2.5.0
@trigger ${loc}proftpd-1.3.0rc2-2.5.0 --with=ldap
@install ${loc}gdbm-1.8.3-2.5.0
@install ${plusloc}dbtool-1.6-2.5.0
@trigger ${altloc}postfix-2.2.5-2.5.0_kolab --with=ldap --with=sasl --with=ssl
@install ${loc}perl-ldap-5.8.7-2.5.0
@install ${loc}perl-db-5.8.7-2.5.1
@install ${loc}config-20051002-2.5.0
@trigger ${altloc}imapd-2.2.12-2.5.0_kolab2 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=folderchar --with=morelogging # Drop morelogging if you dont want/need it
@install ${loc}libiconv-1.10-2.5.0
@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 ${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
@install ${loc}libxml-2.6.22-2.5.0
@install ${loc}libxslt-1.1.15-2.5.1 # WARNING: Remove libgcrypt before building!
@trigger ${altloc}apache-1.3.33-2.5.6_kolab \
--with=mod_auth_ldap \
--with=mod_dav \
--with=mod_php \
--with=mod_php_zlib \
--with=mod_php_gdbm \
--with=mod_php_gettext \
--with=mod_php_imap \
--with=mod_php_openldap \
--with=mod_php_xml \
--with=mod_php_dom \
--with=mod_ssl \
--with=mod_php_mbstring
@trigger ${altloc}php-4.4.0-2.5.2_kolab \
--with=zlib \
--with=gdbm \
--with=gettext \
--with=imap \
--with=openldap \
--with=pear \
--with=xml \
--with=dom \
--with=ssl \
--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 ${plusloc}amavisd-2.3.3-2.5.0
@trigger ${loc}curl-7.15.0-2.5.2
@install ${altloc}clamav-0.88.7-20061211
# @install ${loc}vim-6.3.78-2.4.0
# @install ${plusloc}dcron-2.9-2.4.0
@install ${altloc}perl-kolab-5.8.7-20070117
@install ${altloc}kolabd-2.1_cvs-20070216 --define kolab_version=$kolab_version
@install ${altloc}kolab-webadmin-2.1_cvs-20070216 --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.1_cvs-20070124 --define kolab_version=$kolab_version
@install ${altloc}kolab-horde-fbview-2.0.99-20070112 --define kolab_version=$kolab_version
@check
if test ! -e "/usr/bin/kolab" ; then
echo
echo "Adding symbolic link to $PREFIX/bin/kolab as /usr/bin/kolab"
ln -s $PREFIX/bin/kolab /usr/bin/kolab
fi
@forcein ${altloc}PEAR-Console_Getopt-1.2.1-1
@forcein ${altloc}PEAR-Archive_Tar-1.3.2-1
@forcein ${altloc}PEAR-PEAR-1.4.11-1
@install ${altloc}PEAR-Auth_SASL-1.0.2-1
@install ${altloc}PEAR-Date-1.4.7-1
@install ${altloc}PEAR-Log-1.9.9-1
@install ${altloc}PEAR-Mail-1.1.14-1
@install ${altloc}PEAR-Mail_Mime-1.3.1-1
@install ${altloc}PEAR-Net_Sieve-1.1.5-1
@install ${altloc}PEAR-Net_Socket-1.0.6-1
@install ${altloc}horde-framework-kolab-20070403-1
@install ${altloc}horde-kolab-20070319-3
@install ${altloc}horde-imp-kolab-20070213-1
@install ${altloc}horde-ingo-kolab-20070104-1
@install ${altloc}horde-kronolith-kolab-20070201-1
@install ${altloc}horde-mnemo-kolab-20070403-1
@install ${altloc}horde-nag-kolab-20070403-1
@install ${altloc}horde-passwd-kolab-20070104-1
@install ${altloc}horde-turba-kolab-20070403-1
%dump
echo "PRG = \"$PRG\""
echo "CMD = \"$CMD\""
echo "URL = \"$URL\""
echo "MIRROR = \"$MIRROR\""
echo "USERNAME = \"$USERNAME\""
echo "TRACK = \"$TRACK\""
echo "EGREP = \"$EGREP\""
echo "CHECKONLY = \"$CHECKONLY\""
echo "ERASESURPLUS = \"$ERASESURPLUS\""
echo "HASX11 = \"$HASX11\""
echo "PREFIX = \"${PREFIX}\""
echo "ARCH = \"${ARCH}\""
echo "OS = \"${OS}\""
echo "TAG = \"${TAG}\""
echo "TMPDIR=\"${TMPDIR}\""
From cvs at kolab.org Tue May 29 17:21:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 17:21:33 +0200 (CEST)
Subject: gunnar: server README.webclient,1.1,1.2
Message-ID: <20070529152133.A8524617E54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv6352
Modified Files:
README.webclient
Log Message:
Update horde webclient instruction.
Index: README.webclient
===================================================================
RCS file: /kolabrepository/server/README.webclient,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.webclient 29 May 2007 15:07:06 -0000 1.1
+++ README.webclient 29 May 2007 15:21:31 -0000 1.2
@@ -1,10 +1,18 @@
-== Installation on top of a running server ==
+Installing the Horde web client on a Kolab server
+=================================================
+
+Please note that the web client is still in a beta phase and while the
+Kolab support within the Horde web client has significantly improved,
+you are NOT advised to install Horde on a productive server!
+
+Installation on an already installed Kolab-2.1 server
+-----------------------------------------------------
PLEASE NOTE: This is still highly experimental and may damage your
existing Kolab installation. Do NOT install these packages on a
productive machine!
-This works only with the Kolab-2.1_RC1 server version!
+This works only with the Kolab-2.1 server version!
Move into the directory where you dowloaded the Kolab source packages
and the obmtool script.
@@ -32,14 +40,16 @@
/kolab/bin/openpkg rc all restart
-
-== Full installation ==
+Full Kolab-2.1 installation including the web client
+----------------------------------------------------
This is can be used to get a current, full installation including
horde in a few steps:
-# Remove the /kolab directoy and any sources in /tmp/kolab
-rm -rf /kolab /tmp/kolab
+# Remove the /kolab directoy and any sources in /tmp/kolab (or
+# whereever you wish to store the downloaded packages)
+rm -rf /kolab
+/tmp/kolab
# Get the sources
mkdir /tmp/kolab
From cvs at kolab.org Tue May 29 17:24:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 17:24:48 +0200 (CEST)
Subject: gunnar: server obmtool-webclient.conf,1.1,1.2
Message-ID: <20070529152448.55FA2617E54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv6440
Modified Files:
obmtool-webclient.conf
Log Message:
Update draft version for the modified obmtool.conf.
Index: obmtool-webclient.conf
===================================================================
RCS file: /kolabrepository/server/obmtool-webclient.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- obmtool-webclient.conf 29 May 2007 15:16:09 -0000 1.1
+++ obmtool-webclient.conf 29 May 2007 15:24:46 -0000 1.2
@@ -11,27 +11,27 @@
%common
@hasfeature TAGFMT || exit # require obmtool to support TAGFMT
TMPDIR=/var/tmp # large tmp with 300MB space
- URL="" # used for non-ftp://ftp.openpkg.org/ packages
+ URL="ftp://ftp.klaralvdalens-datakonsult.se/pub/kolab/server/current/2.1" # used for non-ftp://ftp.openpkg.org/ packages
USERNAME=""
for opt in $cmdargs ; do
arg=`echo "${opt}" | sed -e 's;^[^=]*=*;;'`
opt=`echo "${opt}" | sed -e 's;=.*$;;'`
case $opt in
-u|--user) USERNAME="$arg";;
- --url) URL="";;
+ --url) URL="$arg";;
esac
done
%kolab
echo "---- boot/build ${NODE} %${CMD} ----"
- kolab_version="2.1rc1";
+ kolab_version="2.1.0";
PREFIX=/${CMD};
- loc='./' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
- plusloc='./'
- altloc='./'
+ loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
+ plusloc='+'
+ altloc='='
with_genuine=no
- # Check for presence of libgcrypt in the host system
+ # Check for presence of libgcrypt development files in the host system
libgcrypt_pfx=`eval libgcrypt-config --prefix 2>/dev/null`;
if test -n "$libgcrypt_pfx" ; then
echo "libgcrypt installation in $libgcrypt_pfx detected";
@@ -52,10 +52,16 @@
$PREFIX/bin/openpkg register --mode=post --user=$USERNAME
$PREFIX/bin/openpkg register --printstatus && echo "Please associate the instance now. Then RETURN to continue." && read DUMMY
fi
+
+ # Get rid of gdbm
+ @wiperpm gdbm-1.8.3-2.5.0
+ @wiperpm dbtool-1.6-2.5.0
+ $PREFIX/bin/openpkg rpm -e --nodeps gdbm dbtool
+
@install ${loc}make-3.80-2.5.0
@install ${loc}binutils-2.16.1-2.5.1
@install ${loc}gcc-4.0.2-2.5.0
- @install ${loc}fsl-1.6.1-2.5.0
+ @install ${altloc}fsl-1.7.0-2.20070303
@install ${loc}mm-1.4.0-2.5.0
@install ${loc}perl-5.8.7-2.5.1
@install ${loc}perl-openpkg-5.8.7-2.5.0
@@ -99,8 +105,8 @@
@trigger ${loc}sasl-2.1.21-2.5.0 --with=ldap --with=login
@install ${loc}getopt-20051005-2.5.0
@trigger ${loc}proftpd-1.3.0rc2-2.5.0 --with=ldap
- @install ${loc}gdbm-1.8.3-2.5.0
- @install ${plusloc}dbtool-1.6-2.5.0
+ #@install ${loc}gdbm-1.8.3-2.5.0
+ #@install ${plusloc}dbtool-1.6-2.5.0
@trigger ${altloc}postfix-2.2.5-2.5.0_kolab --with=ldap --with=sasl --with=ssl
@install ${loc}perl-ldap-5.8.7-2.5.0
@install ${loc}perl-db-5.8.7-2.5.1
@@ -110,18 +116,19 @@
@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
@install ${loc}libxml-2.6.22-2.5.0
- @install ${loc}libxslt-1.1.15-2.5.1 # WARNING: Remove libgcrypt before building!
- @trigger ${altloc}apache-1.3.33-2.5.6_kolab \
+ @install ${loc}libxslt-1.1.15-2.5.1 # WARNING: Remove libgcrypt development files before building!
+ @trigger ${altloc}apache-1.3.33-2.5.6_kolab2 \
+ --without=gdbm_ndbm \
--with=mod_auth_ldap \
--with=mod_dav \
--with=mod_php \
--with=mod_php_zlib \
- --with=mod_php_gdbm \
+ --with=mod_php_bdb \
--with=mod_php_gettext \
--with=mod_php_imap \
--with=mod_php_openldap \
@@ -129,9 +136,9 @@
--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=gdbm \
+ --with=bdb \
--with=gettext \
--with=imap \
--with=openldap \
@@ -142,25 +149,18 @@
--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 ${plusloc}amavisd-2.3.3-2.5.0
+ @install ${altloc}spamassassin-3.1.0-2.5.1_kolab
+ @install ${altloc}amavisd-2.3.3-2.5.0_kolab
@trigger ${loc}curl-7.15.0-2.5.2
- @install ${altloc}clamav-0.88.7-20061211
-# @install ${loc}vim-6.3.78-2.4.0
-# @install ${plusloc}dcron-2.9-2.4.0
- @install ${altloc}perl-kolab-5.8.7-20070117
- @install ${altloc}kolabd-2.1_cvs-20070216 --define kolab_version=$kolab_version
- @install ${altloc}kolab-webadmin-2.1_cvs-20070216 --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.1_cvs-20070124 --define kolab_version=$kolab_version
- @install ${altloc}kolab-horde-fbview-2.0.99-20070112 --define kolab_version=$kolab_version
- @check
-
- if test ! -e "/usr/bin/kolab" ; then
- echo
- echo "Adding symbolic link to $PREFIX/bin/kolab as /usr/bin/kolab"
- ln -s $PREFIX/bin/kolab /usr/bin/kolab
- fi
+ @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-20070420
+ @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-20070510 --define kolab_version=$kolab_version
+ @install ${altloc}kolab-horde-fbview-2.1.0-20070420 --define kolab_version=$kolab_version
@forcein ${altloc}PEAR-Console_Getopt-1.2.1-1
@forcein ${altloc}PEAR-Archive_Tar-1.3.2-1
@forcein ${altloc}PEAR-PEAR-1.4.11-1
@@ -171,16 +171,22 @@
@install ${altloc}PEAR-Mail_Mime-1.3.1-1
@install ${altloc}PEAR-Net_Sieve-1.1.5-1
@install ${altloc}PEAR-Net_Socket-1.0.6-1
- @install ${altloc}horde-framework-kolab-20070403-1
- @install ${altloc}horde-kolab-20070319-3
- @install ${altloc}horde-imp-kolab-20070213-1
- @install ${altloc}horde-ingo-kolab-20070104-1
- @install ${altloc}horde-kronolith-kolab-20070201-1
- @install ${altloc}horde-mnemo-kolab-20070403-1
- @install ${altloc}horde-nag-kolab-20070403-1
- @install ${altloc}horde-passwd-kolab-20070104-1
- @install ${altloc}horde-turba-kolab-20070403-1
+ @install ${altloc}horde-framework-kolab-20070524-1
+ @install ${altloc}horde-kolab-20070524-1
+ @install ${altloc}horde-imp-kolab-20070524-1
+ @install ${altloc}horde-ingo-kolab-20070524-1
+ @install ${altloc}horde-kronolith-kolab-20070528-1
+ @install ${altloc}horde-mnemo-kolab-20070524-1
+ @install ${altloc}horde-nag-kolab-20070528-1
+ @install ${altloc}horde-passwd-kolab-20070524-1
+ @install ${altloc}horde-turba-kolab-20070524-1
+ @check
+ if test ! -e "/usr/bin/kolab" ; then
+ echo
+ echo "Adding symbolic link to $PREFIX/bin/kolab as /usr/bin/kolab"
+ ln -s $PREFIX/bin/kolab /usr/bin/kolab
+ fi
From cvs at kolab.org Tue May 29 22:32:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:32:38 +0200 (CEST)
Subject: gunnar: server README.webclient,1.2,1.3
Message-ID: <20070529203238.31948617E55@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv11829
Modified Files:
README.webclient
Log Message:
Updated Horde install instructions.
Index: README.webclient
===================================================================
RCS file: /kolabrepository/server/README.webclient,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README.webclient 29 May 2007 15:21:31 -0000 1.2
+++ README.webclient 29 May 2007 20:32:36 -0000 1.3
@@ -54,7 +54,7 @@
# Get the sources
mkdir /tmp/kolab
cd /tmp/kolab
-wget -q -r -l1 -nd --no-parent http://max.kde.org:8080/mirrors/ftp.kolab.org/server/beta/kolab-server-2.1-rc-1/sources/
+wget -q -r -l1 -nd --no-parent http://max.kde.org:8080/mirrors/ftp.kolab.org/server/release/kolab-server-2.1.0/sources
rm obmtool.conf
wget -q -r -l1 -nd --no-parent http://build.pardus.de/downloads/kolab-horde-tmp
@@ -66,3 +66,24 @@
# Restart services
/kolab/bin/openpkg rc all restart
+
+
+BUGS
+----
+
+The Horde web client is currently in a beta phase. We encourage all
+people that do not run a production server and that are interested in
+hosting a Horde web client to join the bug hunting phase. Please
+submit any problems you might have either to the Kolab bug tracker
+(https://www.intevation.de/roundup/kolab/) using the keyword "horde"
+or to the Kolab queue of the Horde bug tracker
+(http://bugs.horde.org/).
+
+KNOWN PROBLEMS
+--------------
+
+Known problems are collected here (as well as in the bug trackers
+mentioned above):
+
+http://wiki.kolab.org/index.php/Horde
+
From cvs at kolab.org Tue May 29 22:34:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:28 +0200 (CEST)
Subject: gunnar: server/PEAR-Archive_Tar ChangeLog,NONE,1.1
Message-ID: <20070529203428.2C434617E55@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv11928/PEAR-Archive_Tar
Added Files:
ChangeLog
Log Message:
Added PEAR-* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* PEAR-Archive_Tar.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:28 +0200 (CEST)
Subject: gunnar: server/PEAR-Auth_SASL ChangeLog,NONE,1.1
Message-ID: <20070529203428.2FEE2617E58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv11928/PEAR-Auth_SASL
Added Files:
ChangeLog
Log Message:
Added PEAR-* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* PEAR-Auth_SASL.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:28 +0200 (CEST)
Subject: gunnar: server/PEAR-Console_Getopt ChangeLog,NONE,1.1
Message-ID: <20070529203428.32D8C617E68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv11928/PEAR-Console_Getopt
Added Files:
ChangeLog
Log Message:
Added PEAR-* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* PEAR-Console_Getopt.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:28 +0200 (CEST)
Subject: gunnar: server/PEAR-Mail ChangeLog,NONE,1.1
Message-ID: <20070529203428.3C039617E6C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Mail
In directory doto:/tmp/cvs-serv11928/PEAR-Mail
Added Files:
ChangeLog
Log Message:
Added PEAR-* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* PEAR-Mail.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:28 +0200 (CEST)
Subject: gunnar: server/PEAR-Mail_Mime ChangeLog,NONE,1.1
Message-ID: <20070529203428.3CF6D617E6D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv11928/PEAR-Mail_Mime
Added Files:
ChangeLog
Log Message:
Added PEAR-* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* PEAR-Mail_Mime.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:28 +0200 (CEST)
Subject: gunnar: server/PEAR-Log ChangeLog,NONE,1.1
Message-ID: <20070529203428.38DEB617E6B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Log
In directory doto:/tmp/cvs-serv11928/PEAR-Log
Added Files:
ChangeLog
Log Message:
Added PEAR-* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* PEAR-Log.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:28 +0200 (CEST)
Subject: gunnar: server/PEAR-Net_Socket ChangeLog,NONE,1.1
Message-ID: <20070529203428.44097617E58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv11928/PEAR-Net_Socket
Added Files:
ChangeLog
Log Message:
Added PEAR-* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* PEAR-Net_Socket.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:28 +0200 (CEST)
Subject: gunnar: server/PEAR-PEAR ChangeLog,NONE,1.1
Message-ID: <20070529203428.45E31617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-PEAR
In directory doto:/tmp/cvs-serv11928/PEAR-PEAR
Added Files:
ChangeLog
Log Message:
Added PEAR-* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* PEAR-PEAR.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:28 +0200 (CEST)
Subject: gunnar: server/PEAR-Net_Sieve ChangeLog,NONE,1.1
Message-ID: <20070529203428.3FD86617E55@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv11928/PEAR-Net_Sieve
Added Files:
ChangeLog
Log Message:
Added PEAR-* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* PEAR-Net_Sieve.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:28 +0200 (CEST)
Subject: gunnar: server/PEAR-Date ChangeLog,NONE,1.1
Message-ID: <20070529203428.3587D617E6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/PEAR-Date
In directory doto:/tmp/cvs-serv11928/PEAR-Date
Added Files:
ChangeLog
Log Message:
Added PEAR-* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* PEAR-Date.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:39 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:39 +0200 (CEST)
Subject: gunnar: server/horde-framework ChangeLog,NONE,1.1
Message-ID: <20070529203439.93EED617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-framework
In directory doto:/tmp/cvs-serv11991/horde-framework
Added Files:
ChangeLog
Log Message:
Added horde* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-framework-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:39 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:39 +0200 (CEST)
Subject: gunnar: server/horde ChangeLog,NONE,1.1
Message-ID: <20070529203439.91F1E617E6D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde
In directory doto:/tmp/cvs-serv11991/horde
Added Files:
ChangeLog
Log Message:
Added horde* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:40 +0200 (CEST)
Subject: gunnar: server/horde-ingo ChangeLog,NONE,1.1
Message-ID: <20070529203440.19D13617E6F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-ingo
In directory doto:/tmp/cvs-serv11991/horde-ingo
Added Files:
ChangeLog
Log Message:
Added horde* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-ingo-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:40 +0200 (CEST)
Subject: gunnar: server/horde-imp ChangeLog,NONE,1.1
Message-ID: <20070529203440.19019617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-imp
In directory doto:/tmp/cvs-serv11991/horde-imp
Added Files:
ChangeLog
Log Message:
Added horde* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-imp-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:40 +0200 (CEST)
Subject: gunnar: server/horde-kronolith ChangeLog,NONE,1.1
Message-ID: <20070529203440.1AA14617E70@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-kronolith
In directory doto:/tmp/cvs-serv11991/horde-kronolith
Added Files:
ChangeLog
Log Message:
Added horde* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-kronolith-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:40 +0200 (CEST)
Subject: gunnar: server/horde-mnemo ChangeLog,NONE,1.1
Message-ID: <20070529203440.37E79617E71@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-mnemo
In directory doto:/tmp/cvs-serv11991/horde-mnemo
Added Files:
ChangeLog
Log Message:
Added horde* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-mnemo-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:40 +0200 (CEST)
Subject: gunnar: server/horde-passwd ChangeLog,NONE,1.1
Message-ID: <20070529203440.CEDDB617E76@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-passwd
In directory doto:/tmp/cvs-serv11991/horde-passwd
Added Files:
ChangeLog
Log Message:
Added horde* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-passwd-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:40 +0200 (CEST)
Subject: gunnar: server/horde-nag ChangeLog,NONE,1.1
Message-ID: <20070529203440.3A7BE617E72@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-nag
In directory doto:/tmp/cvs-serv11991/horde-nag
Added Files:
ChangeLog
Log Message:
Added horde* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-nag-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:34:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:34:41 +0200 (CEST)
Subject: gunnar: server/horde-turba ChangeLog,NONE,1.1
Message-ID: <20070529203441.1D9D4617E70@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-turba
In directory doto:/tmp/cvs-serv11991/horde-turba
Added Files:
ChangeLog
Log Message:
Added horde* changelogs.
--- NEW FILE: ChangeLog ---
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-turba-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Tue May 29 22:35:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:35:20 +0200 (CEST)
Subject: gunnar: server/horde-nag horde-nag-kolab.spec,1.1,1.2
Message-ID: <20070529203520.ED802617E6F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-nag
In directory doto:/tmp/cvs-serv12079/horde-nag
Modified Files:
horde-nag-kolab.spec
Log Message:
Updated to current horde snapshots.
Index: horde-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-nag-kolab.spec 25 May 2007 13:10:05 -0000 1.1
+++ horde-nag-kolab.spec 29 May 2007 20:35:18 -0000 1.2
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
-%define V_day 24
+%define V_day 29
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Tue May 29 22:35:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:35:20 +0200 (CEST)
Subject: gunnar: server/horde-ingo horde-ingo-kolab.spec,1.1,1.2
Message-ID: <20070529203520.E4629617E6D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-ingo
In directory doto:/tmp/cvs-serv12079/horde-ingo
Modified Files:
horde-ingo-kolab.spec
Log Message:
Updated to current horde snapshots.
Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-ingo-kolab.spec 25 May 2007 13:06:44 -0000 1.1
+++ horde-ingo-kolab.spec 29 May 2007 20:35:18 -0000 1.2
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
-%define V_day 24
+%define V_day 29
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Tue May 29 22:35:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:35:20 +0200 (CEST)
Subject: gunnar: server/horde-kronolith horde-kronolith-kolab.spec,1.1,1.2
Message-ID: <20070529203520.E725C617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-kronolith
In directory doto:/tmp/cvs-serv12079/horde-kronolith
Modified Files:
horde-kronolith-kolab.spec
Log Message:
Updated to current horde snapshots.
Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-kronolith-kolab.spec 25 May 2007 12:45:20 -0000 1.1
+++ horde-kronolith-kolab.spec 29 May 2007 20:35:18 -0000 1.2
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
-%define V_day 24
+%define V_day 29
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Tue May 29 22:35:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:35:20 +0200 (CEST)
Subject: gunnar: server/horde-framework horde-framework-kolab.spec,1.2,1.3
Message-ID: <20070529203520.DAC10617E68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-framework
In directory doto:/tmp/cvs-serv12079/horde-framework
Modified Files:
horde-framework-kolab.spec
Log Message:
Updated to current horde snapshots.
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-framework-kolab.spec 25 May 2007 09:25:20 -0000 1.2
+++ horde-framework-kolab.spec 29 May 2007 20:35:18 -0000 1.3
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
-%define V_day 24
+%define V_day 29
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Tue May 29 22:35:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:35:20 +0200 (CEST)
Subject: gunnar: server/horde-imp horde-imp-kolab.spec,1.2,1.3
Message-ID: <20070529203520.E17FA617E6C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-imp
In directory doto:/tmp/cvs-serv12079/horde-imp
Modified Files:
horde-imp-kolab.spec
Log Message:
Updated to current horde snapshots.
Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-imp-kolab.spec 25 May 2007 12:08:00 -0000 1.2
+++ horde-imp-kolab.spec 29 May 2007 20:35:18 -0000 1.3
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
-%define V_day 24
+%define V_day 29
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Tue May 29 22:35:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:35:20 +0200 (CEST)
Subject: gunnar: server/horde-passwd horde-passwd-kolab.spec,1.1,1.2
Message-ID: <20070529203520.F2E32617E6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-passwd
In directory doto:/tmp/cvs-serv12079/horde-passwd
Modified Files:
horde-passwd-kolab.spec
Log Message:
Updated to current horde snapshots.
Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-passwd-kolab.spec 25 May 2007 12:59:14 -0000 1.1
+++ horde-passwd-kolab.spec 29 May 2007 20:35:18 -0000 1.2
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
-%define V_day 24
+%define V_day 29
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Tue May 29 22:35:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:35:21 +0200 (CEST)
Subject: gunnar: server/horde-turba horde-turba-kolab.spec,1.1,1.2
Message-ID: <20070529203521.01ACE617E70@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-turba
In directory doto:/tmp/cvs-serv12079/horde-turba
Modified Files:
horde-turba-kolab.spec
Log Message:
Updated to current horde snapshots.
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-turba-kolab.spec 25 May 2007 12:07:17 -0000 1.1
+++ horde-turba-kolab.spec 29 May 2007 20:35:18 -0000 1.2
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
-%define V_day 24
+%define V_day 29
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Tue May 29 22:35:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:35:20 +0200 (CEST)
Subject: gunnar: server/horde-mnemo horde-mnemo-kolab.spec,1.1,1.2
Message-ID: <20070529203520.F0FE3617E68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-mnemo
In directory doto:/tmp/cvs-serv12079/horde-mnemo
Modified Files:
horde-mnemo-kolab.spec
Log Message:
Updated to current horde snapshots.
Index: horde-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-mnemo-kolab.spec 25 May 2007 12:51:22 -0000 1.1
+++ horde-mnemo-kolab.spec 29 May 2007 20:35:18 -0000 1.2
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
-%define V_day 24
+%define V_day 29
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Tue May 29 22:35:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 May 2007 22:35:20 +0200 (CEST)
Subject: gunnar: server/horde horde-kolab.spec,1.1,1.2
Message-ID: <20070529203520.DF96E617E6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde
In directory doto:/tmp/cvs-serv12079/horde
Modified Files:
horde-kolab.spec
Log Message:
Updated to current horde snapshots.
Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-kolab.spec 25 May 2007 10:21:44 -0000 1.1
+++ horde-kolab.spec 29 May 2007 20:35:18 -0000 1.2
@@ -3,7 +3,7 @@
%define V_package %{V_horde_name}-kolab
%define V_year 2007
%define V_month 05
-%define V_day 24
+%define V_day 29
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Wed May 30 00:17:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 May 2007 00:17:33 +0200 (CEST)
Subject: gunnar: server/horde-framework Kolab-Kolab-IMAP-cclient.php.patch,
NONE, 1.1 horde-framework-kolab.spec, 1.3, 1.4 ChangeLog, 1.1, 1.2
Message-ID: <20070529221733.E690B617E56@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-framework
In directory doto:/tmp/cvs-serv14500
Modified Files:
horde-framework-kolab.spec ChangeLog
Added Files:
Kolab-Kolab-IMAP-cclient.php.patch
Log Message:
* horde-framework-kolab.spec:
Added Kolab-Kolab-IMAP-cclient.php.patch since Kolab-2.1
still has a segfaulting PHP. See
https://www.intevation.de/roundup/kolab/issue1673
--- NEW FILE: Kolab-Kolab-IMAP-cclient.php.patch ---
Index: Kolab/Kolab/IMAP/cclient.php
===================================================================
--- Kolab/Kolab/IMAP/cclient.php (Revision 2512)
+++ Kolab/Kolab/IMAP/cclient.php (Arbeitskopie)
@@ -436,9 +436,13 @@
function setAnnotation($entries, $values, $mailbox_name)
{
foreach ($values as $key => $value) {
- $result = @imap_setannotation($this->_imap, $mailbox_name, $entries, $key, $value);
- if (!$result) {
- return PEAR::raiseError(sprintf(_("IMAP error. Folder: %s. Error: %s"), $mailbox_name, @imap_last_error()));
+ // Necessary fix until imap_(get/set)annotation works right
+ // See https://www.intevation.de/roundup/kolab/issue1673
+ if ($value != "") {
+ $result = @imap_setannotation($this->_imap, $mailbox_name, $entries, $key, $value);
+ if (!$result) {
+ return PEAR::raiseError(sprintf(_("IMAP error. Folder: %s. Error: %s"), $mailbox_name, @imap_last_error()));
+ }
}
}
return true;
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-framework-kolab.spec 29 May 2007 20:35:18 -0000 1.3
+++ horde-framework-kolab.spec 29 May 2007 22:17:31 -0000 1.4
@@ -30,6 +30,14 @@
# to get fixed to be able to remove this patch.
Patch0: Prefs-Prefs-kolab.php.patch
+##################################################
+# PATCH COMMENT
+#
+# Required as long as we use the broken
+# php-patch. See issue
+# https://www.intevation.de/roundup/kolab/issue1673
+Patch1: Kolab-Kolab-IMAP-cclient.php.patch
+
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
@@ -48,6 +56,7 @@
%prep
%setup -n framework
%patch -p0 -P 0
+ %patch -p0 -P 1
%build
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-framework/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 29 May 2007 20:34:37 -0000 1.1
+++ ChangeLog 29 May 2007 22:17:31 -0000 1.2
@@ -1,3 +1,11 @@
+2007-05-30 Gunnar Wrobel <p at rdus.de>
+
+ * horde-framework-kolab.spec:
+
+ Added Kolab-Kolab-IMAP-cclient.php.patch since Kolab-2.1
+ still has a segfaulting PHP. See
+ https://www.intevation.de/roundup/kolab/issue1673
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-framework-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Wed May 30 08:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 May 2007 08:04:55 +0200 (CEST)
Subject: gunnar: server obmtool-webclient.conf,1.2,1.3
Message-ID: <20070530060455.ED8F2617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1010
Modified Files:
obmtool-webclient.conf
Log Message:
Updated webclient versions.
Index: obmtool-webclient.conf
===================================================================
RCS file: /kolabrepository/server/obmtool-webclient.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- obmtool-webclient.conf 29 May 2007 15:24:46 -0000 1.2
+++ obmtool-webclient.conf 30 May 2007 06:04:53 -0000 1.3
@@ -171,15 +171,15 @@
@install ${altloc}PEAR-Mail_Mime-1.3.1-1
@install ${altloc}PEAR-Net_Sieve-1.1.5-1
@install ${altloc}PEAR-Net_Socket-1.0.6-1
- @install ${altloc}horde-framework-kolab-20070524-1
- @install ${altloc}horde-kolab-20070524-1
- @install ${altloc}horde-imp-kolab-20070524-1
- @install ${altloc}horde-ingo-kolab-20070524-1
- @install ${altloc}horde-kronolith-kolab-20070528-1
- @install ${altloc}horde-mnemo-kolab-20070524-1
- @install ${altloc}horde-nag-kolab-20070528-1
- @install ${altloc}horde-passwd-kolab-20070524-1
- @install ${altloc}horde-turba-kolab-20070524-1
+ @install ${altloc}horde-framework-kolab-20070529-1
+ @install ${altloc}horde-kolab-20070529-1
+ @install ${altloc}horde-imp-kolab-20070529-1
+ @install ${altloc}horde-ingo-kolab-20070529-1
+ @install ${altloc}horde-kronolith-kolab-20070529-1
+ @install ${altloc}horde-mnemo-kolab-20070529-1
+ @install ${altloc}horde-nag-kolab-20070529-1
+ @install ${altloc}horde-passwd-kolab-20070529-1
+ @install ${altloc}horde-turba-kolab-20070529-1
@check
if test ! -e "/usr/bin/kolab" ; then
From cvs at kolab.org Wed May 30 08:06:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 May 2007 08:06:10 +0200 (CEST)
Subject: gunnar: server Makefile,1.16,1.17
Message-ID: <20070530060610.05F62617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1265
Modified Files:
Makefile
Log Message:
Added dist-horde target to the Makefile.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile 26 Apr 2007 15:21:02 -0000 1.16
+++ Makefile 30 May 2007 06:06:08 -0000 1.17
@@ -1,21 +1,72 @@
+BASE_PACKAGES=file \
+ spamassassin \
+ clamav \
+ amavisd \
+ imap \
+ apache \
+ php \
+ openldap \
+ imapd \
+ postfix \
+ perl-kolab \
+ kolabd \
+ kolab-horde-fbview \
+ kolab-horde-framework \
+ kolab-resource-handlers \
+ php-smarty \
+ kolab-webadmin \
+
+BASE_FILES=obmtool \
+ obmtool.conf \
+ README.1st
+
+.PHONY: dist
dist:
rm -rf stage
mkdir stage
- 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
- cd openldap && make dist
- cd imapd && make dist
- cd postfix && make dist
- cd perl-kolab && make -f Makefile.cvs dist
- cd kolabd && make dist
- cd kolab-horde-framework && make dist
- cd kolab-horde-fbview && make dist
- 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!'
+ for PKG in $(BASE_PACKAGES); \
+ do \
+ make -C $$PKG dist; \
+ done
+ cp $(BASE_FILES) stage/
+ echo 'Remember to update obmtool.conf!'
+
+HORDE_PACKAGES=kolab-webadmin \
+ PEAR-PEAR \
+ PEAR-Archive_Tar \
+ PEAR-Auth_SASL \
+ PEAR-Console_Getopt \
+ PEAR-Date \
+ PEAR-Log \
+ PEAR-Mail \
+ PEAR-Mail_Mime \
+ PEAR-Net_Sieve \
+ PEAR-Net_Socket \
+ horde-framework \
+ horde-passwd \
+ horde \
+ horde-ingo \
+ horde-imp \
+ horde-kronolith \
+ horde-mnemo \
+ horde-nag \
+ horde-turba
+
+.PHONY: dist-horde
+dist-horde:
+ rm -rf stage
+ mkdir -p stage
+ for PKG in $(HORDE_PACKAGES); \
+ do \
+ make -C $$PKG dist; \
+ echo -e "\n==" >> stage/ChangeLog; \
+ echo "$$PKG" >> stage/ChangeLog; \
+ echo -e "==\n" >> stage/ChangeLog; \
+ cat $$PKG/ChangeLog >> stage/ChangeLog; \
+ done
+ cp README.webclient stage/README
+ cp obmtool-webclient.conf stage/obmtool.conf
+
+.PHONY: clean
+clean:
+ rm -rf stage
\ No newline at end of file
From cvs at kolab.org Wed May 30 08:17:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 May 2007 08:17:26 +0200 (CEST)
Subject: gunnar: server Makefile,1.17,1.18
Message-ID: <20070530061726.C22C5617E4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1500
Modified Files:
Makefile
Log Message:
Broken Makefiles in the sub directories.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile 30 May 2007 06:06:08 -0000 1.17
+++ Makefile 30 May 2007 06:17:24 -0000 1.18
@@ -24,9 +24,9 @@
dist:
rm -rf stage
mkdir stage
- for PKG in $(BASE_PACKAGES); \
- do \
- make -C $$PKG dist; \
+ for PKG in $(BASE_PACKAGES); \
+ do \
+ cd $$PKG && make dist;cd ..;\
done
cp $(BASE_FILES) stage/
echo 'Remember to update obmtool.conf!'
@@ -58,7 +58,7 @@
mkdir -p stage
for PKG in $(HORDE_PACKAGES); \
do \
- make -C $$PKG dist; \
+ cd $$PKG && make dist;cd ..; \
echo -e "\n==" >> stage/ChangeLog; \
echo "$$PKG" >> stage/ChangeLog; \
echo -e "==\n" >> stage/ChangeLog; \
From cvs at kolab.org Wed May 30 08:18:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 May 2007 08:18:25 +0200 (CEST)
Subject: gunnar: server obmtool-webclient.conf,1.3,1.4
Message-ID: <20070530061825.9F12B617E4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1562
Modified Files:
obmtool-webclient.conf
Log Message:
Use the cvs version of kolab-webadmin to support horde.
Index: obmtool-webclient.conf
===================================================================
RCS file: /kolabrepository/server/obmtool-webclient.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- obmtool-webclient.conf 30 May 2007 06:04:53 -0000 1.3
+++ obmtool-webclient.conf 30 May 2007 06:18:23 -0000 1.4
@@ -157,7 +157,7 @@
@install ${altloc}clamav-0.90.2-20070413_kolab
@install ${altloc}perl-kolab-5.8.7-20070420
@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-webadmin-2.1.0-20070530 --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-20070510 --define kolab_version=$kolab_version
@install ${altloc}kolab-horde-fbview-2.1.0-20070420 --define kolab_version=$kolab_version
From cvs at kolab.org Wed May 30 08:20:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 May 2007 08:20:01 +0200 (CEST)
Subject: gunnar: server README.webclient,1.3,1.4
Message-ID: <20070530062001.223BD617E4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1601
Modified Files:
README.webclient
Log Message:
Typo
Index: README.webclient
===================================================================
RCS file: /kolabrepository/server/README.webclient,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README.webclient 29 May 2007 20:32:36 -0000 1.3
+++ README.webclient 30 May 2007 06:19:59 -0000 1.4
@@ -49,7 +49,6 @@
# Remove the /kolab directoy and any sources in /tmp/kolab (or
# whereever you wish to store the downloaded packages)
rm -rf /kolab
-/tmp/kolab
# Get the sources
mkdir /tmp/kolab
From cvs at kolab.org Wed May 30 08:21:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 May 2007 08:21:09 +0200 (CEST)
Subject: gunnar: server README.webclient,1.4,1.5
Message-ID: <20070530062109.23DFB617E4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1630
Modified Files:
README.webclient
Log Message:
Typo
Index: README.webclient
===================================================================
RCS file: /kolabrepository/server/README.webclient,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- README.webclient 30 May 2007 06:19:59 -0000 1.4
+++ README.webclient 30 May 2007 06:21:07 -0000 1.5
@@ -49,6 +49,7 @@
# Remove the /kolab directoy and any sources in /tmp/kolab (or
# whereever you wish to store the downloaded packages)
rm -rf /kolab
+rm -rf /tmp/kolab
# Get the sources
mkdir /tmp/kolab
From cvs at kolab.org Wed May 30 11:41:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 May 2007 11:41:44 +0200 (CEST)
Subject: gunnar: server README.webclient,1.5,1.6
Message-ID: <20070530094144.1C085617E57@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv5598
Modified Files:
README.webclient
Log Message:
Updated webclient instructions concerning the horde schema.
Index: README.webclient
===================================================================
RCS file: /kolabrepository/server/README.webclient,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README.webclient 30 May 2007 06:21:07 -0000 1.5
+++ README.webclient 30 May 2007 09:41:41 -0000 1.6
@@ -32,6 +32,12 @@
as in a standard Kolab installation.
+Now you need to edit the file /kolab/etc/kolab/templates/slapd.conf.template and uncomment the line
+
+ include /kolab/etc/openldap/schema/horde.schema
+
+in order to include the Horde schema into the OpenLDAP configuration.
+
Finally configure Horde with
/kolab/sbin/kolabconf
@@ -60,6 +66,9 @@
# Install kolab
sh obmtool kolab &> kolab-build.log
+
+# Uncomment the horde schema
+sed -i -e 's/^#\(.*horde.*\)/\1/' /kolab/etc/kolab/templates/slapd.conf.template
# Bootstrap Kolab
/kolab/etc/kolab/kolab_bootstrap -b
From cvs at kolab.org Wed May 30 13:38:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 May 2007 13:38:58 +0200 (CEST)
Subject: gunnar: server README.webclient,1.6,1.7
Message-ID: <20070530113858.9C1F1617E4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv7567
Modified Files:
README.webclient
Log Message:
Another typo.
Index: README.webclient
===================================================================
RCS file: /kolabrepository/server/README.webclient,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- README.webclient 30 May 2007 09:41:41 -0000 1.6
+++ README.webclient 30 May 2007 11:38:56 -0000 1.7
@@ -73,8 +73,8 @@
# Bootstrap Kolab
/kolab/etc/kolab/kolab_bootstrap -b
-# Restart services
-/kolab/bin/openpkg rc all restart
+# Start all services
+/kolab/bin/openpkg rc all start
BUGS
From cvs at kolab.org Thu May 31 16:09:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 May 2007 16:09:17 +0200 (CEST)
Subject: gunnar: server/horde-turba lib-Turba.php.patch, 1.1,
1.2 horde-turba-kolab.spec, 1.2, 1.3 ChangeLog, 1.1, 1.2
Message-ID: <20070531140917.04BBD617E4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-turba
In directory doto:/tmp/cvs-serv19599/horde-turba
Modified Files:
lib-Turba.php.patch horde-turba-kolab.spec ChangeLog
Log Message:
* lib-Turba.php.patch:
Add support for renaming shares within Turba.
Index: lib-Turba.php.patch
===================================================================
RCS file: /kolabrepository/server/horde-turba/lib-Turba.php.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lib-Turba.php.patch 25 May 2007 12:07:17 -0000 1.1
+++ lib-Turba.php.patch 31 May 2007 14:09:14 -0000 1.2
@@ -4,7 +4,7 @@
retrieving revision 1.121
diff -u -B -r1.121 Turba.php
--- lib/Turba.php 12 May 2007 14:58:12 -0000 1.121
-+++ lib/Turba.php 25 May 2007 11:01:42 -0000
++++ lib/Turba.php 31 May 2007 14:02:13 -0000
@@ -332,14 +332,13 @@
} else {
$source = $in;
@@ -21,3 +21,20 @@
($source === $in)) {
// Using Horde_Perms AND checking source level permsissions
return $perms->hasPermission('turba:sources:' . $in, $userID,
+@@ -580,6 +579,7 @@
+ function updateShare($name, $params)
+ {
+ $share = &$GLOBALS['turba_shares']->getShare($name);
++ $old_id = $share->getId();
+ if (is_a($share, 'PEAR_Error')) {
+ return $share;
+ }
+@@ -590,6 +590,8 @@
+ if (is_a($result, 'PEAR_Error')) {
+ return $result;
+ } else {
++ unset($GLOBALS['cfgSources'][$old_id]);
++ Turba::addSourceFromShare($share);
+ return $share->get('name');
+ }
+ }
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-turba-kolab.spec 29 May 2007 20:35:18 -0000 1.2
+++ horde-turba-kolab.spec 31 May 2007 14:09:14 -0000 1.3
@@ -29,6 +29,9 @@
# PATCH COMMENT
#
# Check if this can be integrated upstream
+#
+# The second part of the patch allows to rename
+# shares
Patch0: lib-Turba.php.patch
##################################################
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-turba/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 29 May 2007 20:34:37 -0000 1.1
+++ ChangeLog 31 May 2007 14:09:14 -0000 1.2
@@ -1,3 +1,9 @@
+2007-05-31 Gunnar Wrobel <p at rdus.de>
+
+ * lib-Turba.php.patch:
+
+ Add support for renaming shares within Turba.
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-turba-kolab.spec: Added package to Kolab CVS.
From cvs at kolab.org Thu May 31 16:31:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 May 2007 16:31:12 +0200 (CEST)
Subject: gunnar: server/horde-mnemo ChangeLog, 1.1, 1.2 horde-mnemo-kolab.spec,
1.2, 1.3
Message-ID: <20070531143112.40D37617E65@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-mnemo
In directory doto:/tmp/cvs-serv19984/horde-mnemo
Modified Files:
ChangeLog horde-mnemo-kolab.spec
Log Message:
Prepare another release for tomorrow.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-mnemo/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 29 May 2007 20:34:37 -0000 1.1
+++ ChangeLog 31 May 2007 14:31:10 -0000 1.2
@@ -1,3 +1,7 @@
+2007-05-31 Gunnar Wrobel <p at rdus.de>
+
+ * horde-mnemo-kolab.spec: Update to 20070601
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-mnemo-kolab.spec: Added package to Kolab CVS.
Index: horde-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-mnemo-kolab.spec 29 May 2007 20:35:18 -0000 1.2
+++ horde-mnemo-kolab.spec 31 May 2007 14:31:10 -0000 1.3
@@ -2,8 +2,8 @@
%define V_horde_name mnemo
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 05
-%define V_day 29
+%define V_month 06
+%define V_day 01
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Thu May 31 16:31:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 May 2007 16:31:12 +0200 (CEST)
Subject: gunnar: server/horde ChangeLog,1.1,1.2 horde-kolab.spec,1.2,1.3
Message-ID: <20070531143112.30058617E4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde
In directory doto:/tmp/cvs-serv19984/horde
Modified Files:
ChangeLog horde-kolab.spec
Log Message:
Prepare another release for tomorrow.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 29 May 2007 20:34:37 -0000 1.1
+++ ChangeLog 31 May 2007 14:31:10 -0000 1.2
@@ -1,3 +1,7 @@
+2007-05-31 Gunnar Wrobel <p at rdus.de>
+
+ * horde-kolab.spec: Update to 20070601
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-kolab.spec: Added package to Kolab CVS.
Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-kolab.spec 29 May 2007 20:35:18 -0000 1.2
+++ horde-kolab.spec 31 May 2007 14:31:10 -0000 1.3
@@ -2,8 +2,8 @@
%define V_horde_name horde
%define V_package %{V_horde_name}-kolab
%define V_year 2007
-%define V_month 05
-%define V_day 29
+%define V_month 06
+%define V_day 01
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Thu May 31 16:31:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 May 2007 16:31:12 +0200 (CEST)
Subject: gunnar: server/horde-passwd ChangeLog, 1.1,
1.2 horde-passwd-kolab.spec, 1.2, 1.3
Message-ID: <20070531143112.4A207617E67@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-passwd
In directory doto:/tmp/cvs-serv19984/horde-passwd
Modified Files:
ChangeLog horde-passwd-kolab.spec
Log Message:
Prepare another release for tomorrow.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-passwd/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 29 May 2007 20:34:37 -0000 1.1
+++ ChangeLog 31 May 2007 14:31:10 -0000 1.2
@@ -1,3 +1,7 @@
+2007-05-31 Gunnar Wrobel <p at rdus.de>
+
+ * horde-passwd-kolab.spec: Update to 20070601
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-passwd-kolab.spec: Added package to Kolab CVS.
Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-passwd-kolab.spec 29 May 2007 20:35:18 -0000 1.2
+++ horde-passwd-kolab.spec 31 May 2007 14:31:10 -0000 1.3
@@ -2,8 +2,8 @@
%define V_horde_name passwd
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 05
-%define V_day 29
+%define V_month 06
+%define V_day 01
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Thu May 31 16:31:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 May 2007 16:31:12 +0200 (CEST)
Subject: gunnar: server/horde-kronolith ChangeLog, 1.1,
1.2 horde-kronolith-kolab.spec, 1.2, 1.3
Message-ID: <20070531143112.3D3B8617E56@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-kronolith
In directory doto:/tmp/cvs-serv19984/horde-kronolith
Modified Files:
ChangeLog horde-kronolith-kolab.spec
Log Message:
Prepare another release for tomorrow.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-kronolith/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 29 May 2007 20:34:37 -0000 1.1
+++ ChangeLog 31 May 2007 14:31:10 -0000 1.2
@@ -1,3 +1,7 @@
+2007-05-31 Gunnar Wrobel <p at rdus.de>
+
+ * horde-kronolith-kolab.spec: Update to 20070601
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-kronolith-kolab.spec: Added package to Kolab CVS.
Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-kronolith-kolab.spec 29 May 2007 20:35:18 -0000 1.2
+++ horde-kronolith-kolab.spec 31 May 2007 14:31:10 -0000 1.3
@@ -2,8 +2,8 @@
%define V_horde_name kronolith
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 05
-%define V_day 29
+%define V_month 06
+%define V_day 01
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Thu May 31 16:31:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 May 2007 16:31:12 +0200 (CEST)
Subject: gunnar: server/horde-turba ChangeLog, 1.2, 1.3 horde-turba-kolab.spec,
1.3, 1.4
Message-ID: <20070531143112.4EC80617E6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-turba
In directory doto:/tmp/cvs-serv19984/horde-turba
Modified Files:
ChangeLog horde-turba-kolab.spec
Log Message:
Prepare another release for tomorrow.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-turba/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 31 May 2007 14:09:14 -0000 1.2
+++ ChangeLog 31 May 2007 14:31:10 -0000 1.3
@@ -1,5 +1,7 @@
2007-05-31 Gunnar Wrobel <p at rdus.de>
+ * horde-turba-kolab.spec: Update to 20070601
+
* lib-Turba.php.patch:
Add support for renaming shares within Turba.
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-turba-kolab.spec 31 May 2007 14:09:14 -0000 1.3
+++ horde-turba-kolab.spec 31 May 2007 14:31:10 -0000 1.4
@@ -2,8 +2,8 @@
%define V_horde_name turba
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 05
-%define V_day 29
+%define V_month 06
+%define V_day 01
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Thu May 31 16:31:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 May 2007 16:31:12 +0200 (CEST)
Subject: gunnar: server/horde-nag ChangeLog, 1.1, 1.2 horde-nag-kolab.spec, 1.2,
1.3
Message-ID: <20070531143112.457D8617E66@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-nag
In directory doto:/tmp/cvs-serv19984/horde-nag
Modified Files:
ChangeLog horde-nag-kolab.spec
Log Message:
Prepare another release for tomorrow.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-nag/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 29 May 2007 20:34:37 -0000 1.1
+++ ChangeLog 31 May 2007 14:31:10 -0000 1.2
@@ -1,3 +1,7 @@
+2007-05-31 Gunnar Wrobel <p at rdus.de>
+
+ * horde-nag-kolab.spec: Update to 20070601
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-nag-kolab.spec: Added package to Kolab CVS.
Index: horde-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-nag-kolab.spec 29 May 2007 20:35:18 -0000 1.2
+++ horde-nag-kolab.spec 31 May 2007 14:31:10 -0000 1.3
@@ -2,8 +2,8 @@
%define V_horde_name nag
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 05
-%define V_day 29
+%define V_month 06
+%define V_day 01
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Thu May 31 16:31:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 May 2007 16:31:12 +0200 (CEST)
Subject: gunnar: server/horde-framework ChangeLog, 1.2,
1.3 horde-framework-kolab.spec, 1.4, 1.5
Message-ID: <20070531143112.51F49617E6D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-framework
In directory doto:/tmp/cvs-serv19984/horde-framework
Modified Files:
ChangeLog horde-framework-kolab.spec
Log Message:
Prepare another release for tomorrow.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-framework/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 29 May 2007 22:17:31 -0000 1.2
+++ ChangeLog 31 May 2007 14:31:10 -0000 1.3
@@ -1,3 +1,7 @@
+2007-05-31 Gunnar Wrobel <p at rdus.de>
+
+ * horde-framework-kolab.spec: Update to 20070601
+
2007-05-30 Gunnar Wrobel <p at rdus.de>
* horde-framework-kolab.spec:
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-framework-kolab.spec 29 May 2007 22:17:31 -0000 1.4
+++ horde-framework-kolab.spec 31 May 2007 14:31:10 -0000 1.5
@@ -2,8 +2,8 @@
%define V_horde_name framework
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 05
-%define V_day 29
+%define V_month 06
+%define V_day 01
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Thu May 31 16:31:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 May 2007 16:31:12 +0200 (CEST)
Subject: gunnar: server/horde-imp ChangeLog, 1.1, 1.2 horde-imp-kolab.spec, 1.3,
1.4
Message-ID: <20070531143112.53181617E6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-imp
In directory doto:/tmp/cvs-serv19984/horde-imp
Modified Files:
ChangeLog horde-imp-kolab.spec
Log Message:
Prepare another release for tomorrow.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-imp/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 29 May 2007 20:34:37 -0000 1.1
+++ ChangeLog 31 May 2007 14:31:10 -0000 1.2
@@ -1,3 +1,7 @@
+2007-05-31 Gunnar Wrobel <p at rdus.de>
+
+ * horde-imp-kolab.spec: Update to 20070601
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-imp-kolab.spec: Added package to Kolab CVS.
Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-imp-kolab.spec 29 May 2007 20:35:18 -0000 1.3
+++ horde-imp-kolab.spec 31 May 2007 14:31:10 -0000 1.4
@@ -2,8 +2,8 @@
%define V_horde_name imp
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 05
-%define V_day 29
+%define V_month 06
+%define V_day 01
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Thu May 31 16:31:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 May 2007 16:31:12 +0200 (CEST)
Subject: gunnar: server/horde-ingo ChangeLog, 1.1, 1.2 horde-ingo-kolab.spec,
1.2, 1.3
Message-ID: <20070531143112.56C53617E6F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde-ingo
In directory doto:/tmp/cvs-serv19984/horde-ingo
Modified Files:
ChangeLog horde-ingo-kolab.spec
Log Message:
Prepare another release for tomorrow.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-ingo/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog 29 May 2007 20:34:37 -0000 1.1
+++ ChangeLog 31 May 2007 14:31:10 -0000 1.2
@@ -1,3 +1,7 @@
+2007-05-31 Gunnar Wrobel <p at rdus.de>
+
+ * horde-ingo-kolab.spec: Update to 20070601
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* horde-ingo-kolab.spec: Added package to Kolab CVS.
Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-ingo-kolab.spec 29 May 2007 20:35:18 -0000 1.2
+++ horde-ingo-kolab.spec 31 May 2007 14:31:10 -0000 1.3
@@ -2,8 +2,8 @@
%define V_horde_name ingo
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 05
-%define V_day 29
+%define V_month 06
+%define V_day 01
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
From cvs at kolab.org Fri Jun 1 17:16:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 1 Jun 2007 17:16:34 +0200 (CEST)
Subject: gunnar: server obmtool-webclient.conf,1.4,1.5
Message-ID: <20070601151634.A12BC61442D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv28688
Modified Files:
obmtool-webclient.conf
Log Message:
New Horde-20070601 release.
Index: obmtool-webclient.conf
===================================================================
RCS file: /kolabrepository/server/obmtool-webclient.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- obmtool-webclient.conf 30 May 2007 06:18:23 -0000 1.4
+++ obmtool-webclient.conf 1 Jun 2007 15:16:32 -0000 1.5
@@ -171,15 +171,15 @@
@install ${altloc}PEAR-Mail_Mime-1.3.1-1
@install ${altloc}PEAR-Net_Sieve-1.1.5-1
@install ${altloc}PEAR-Net_Socket-1.0.6-1
- @install ${altloc}horde-framework-kolab-20070529-1
- @install ${altloc}horde-kolab-20070529-1
- @install ${altloc}horde-imp-kolab-20070529-1
- @install ${altloc}horde-ingo-kolab-20070529-1
- @install ${altloc}horde-kronolith-kolab-20070529-1
- @install ${altloc}horde-mnemo-kolab-20070529-1
- @install ${altloc}horde-nag-kolab-20070529-1
- @install ${altloc}horde-passwd-kolab-20070529-1
- @install ${altloc}horde-turba-kolab-20070529-1
+ @install ${altloc}horde-framework-kolab-20070601-1
+ @install ${altloc}horde-kolab-20070601-1
+ @install ${altloc}horde-imp-kolab-20070601-1
+ @install ${altloc}horde-ingo-kolab-20070601-1
+ @install ${altloc}horde-kronolith-kolab-20070601-1
+ @install ${altloc}horde-mnemo-kolab-20070601-1
+ @install ${altloc}horde-nag-kolab-20070601-1
+ @install ${altloc}horde-passwd-kolab-20070601-1
+ @install ${altloc}horde-turba-kolab-20070601-1
@check
if test ! -e "/usr/bin/kolab" ; then
From cvs at kolab.org Fri Jun 1 17:42:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 1 Jun 2007 17:42:43 +0200 (CEST)
Subject: thomas: server obmtool.conf, 1.254, 1.255 release-notes.txt, 1.122,
1.123
Message-ID: <20070601154243.6CCCC614429@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv29098
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.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- obmtool.conf 10 May 2007 10:05:51 -0000 1.254
+++ obmtool.conf 1 Jun 2007 15:42:41 -0000 1.255
@@ -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.2-20070413_kolab
+ @install ${altloc}clamav-0.90.3-20070531_kolab
@install ${altloc}perl-kolab-5.8.7-20070420
@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
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- release-notes.txt 29 May 2007 15:12:23 -0000 1.122
+++ release-notes.txt 1 Jun 2007 15:42:41 -0000 1.123
@@ -32,6 +32,10 @@
Changes between 2.1.0 and 2.1.???:
+ - clamav-0.90.3-20070531_kolab
+
+ New upstream version, fixes various security issues.
+
- kolabd-2.1.0-2007????
kolab/issue919 (kolab server has problems with some characters in passwords)
From cvs at kolab.org Fri Jun 1 17:42:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 1 Jun 2007 17:42:43 +0200 (CEST)
Subject: thomas: server/clamav Makefile,1.3,1.4 kolab.patch,1.4,1.5
Message-ID: <20070601154243.800B5614429@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv29098/clamav
Modified Files:
Makefile kolab.patch
Log Message:
New clamav release
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 17 Apr 2007 11:03:50 -0000 1.3
+++ Makefile 1 Jun 2007 15:42:41 -0000 1.4
@@ -12,9 +12,9 @@
endif
PACKAGE=clamav
-VERSION=0.90.2
-RELEASE=20070413
-KOLABRELEASE=20070413_kolab
+VERSION=0.90.3
+RELEASE=20070531
+KOLABRELEASE=20070531_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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab.patch 17 Apr 2007 11:03:50 -0000 1.4
+++ kolab.patch 1 Jun 2007 15:42:41 -0000 1.5
@@ -3,9 +3,9 @@
@@ -33,7 +33,7 @@ Class: EVAL
Group: AntiVirus
License: GPL
- Version: 0.90.2
--Release: 20070413
-+Release: 20070413_kolab
+ Version: 0.90.3
+-Release: 20070531
++Release: 20070531_kolab
# package options
%option with_milter no
@@ -20,11 +20,3 @@
BuildPreReq: zlib, bzip2, curl, gmp, libiconv, openssl
PreReq: zlib, bzip2, curl, gmp, libiconv, openssl
%if "%{with_milter}" == "yes"
-@@ -84,6 +84,7 @@ AutoReqProv: no
- CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
-+ LIBS="-lintl -liconv" \
- GREP="grep" \
- ./configure \
- --prefix=%{l_prefix} \
From cvs at kolab.org Fri Jun 1 18:14:38 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 1 Jun 2007 18:14:38 +0200 (CEST)
Subject: thomas: doc/www/src/security kolab-vendor-notice-15.txt,NONE,1.1
Message-ID: <20070601161438.07675614421@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/www/src/security
In directory doto:/tmp/cvs-serv30410
Added Files:
kolab-vendor-notice-15.txt
Log Message:
Kolab Security Issue 15 20070601 (clamav)
--- NEW FILE: kolab-vendor-notice-15.txt ---
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Kolab Security Issue 15 20070601
================================
Package: Kolab Server, ClamAV
Vulnerability: denial of service, insecure temporary files
Kolab Specific: no
Dependent Packages: none
Summary
~~~~~~~
- libclamav/unsp.c: fix end of buffer calculation (bb#464, patch from aCaB)
- libclamav/others.c: use strict permissions (0600) for temporary files
created in cli_gentempstream() (bb#517). Reported by Christoph Probst.
- libclamav/unrar/unrar.c: heap corruption causing DoS with corrupted
rar archive, better handle truncated files
- libclamav/phishcheck.c: isURL() regex execution hangs on Solaris
- libclamav/ole2_extract.c: detect block list loop (bb#466), patch from Trog
Affected Versions
~~~~~~~~~~~~~~~~~
This affects versions of ClamAV up to version 0.90.2.
Kolab Server 2.1.0 and previous releases of the 2.1 branch are affected.
Kolab Server 2.0.4 and previous releases of the 2.0 branch are affected,
please upgrade to Kolab Server 2.1.0 first.
Fix
~~~
Upgrade to ClamAV 0.90.3.
The ClamAV source RPM is available from the Kolab download mirrors as:
security-updates/20070601/clamav-0.90.3-20070531_kolab.src.rpm
A binary RPM for Kolab Server 2.1.0 (ix86 Debian GNU/Linux Sarge) is available:
security-updates/20070601/clamav-0.90.3-20070531_kolab.ix86-debian3.1-kolab.rpm
All other server versions: Please build from the src.rpm.
The mirrors are listed on http://kolab.org/mirrors.html
While the mirrors are catching up, you can also get the package via rsync:
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20070601/clamav-0.90.3-20070531_kolab.src.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20070601/clamav-0.90.3-20070531_kolab.ix86-debian3.1-kolab.rpm .
MD5 sums:
1af188d728d10d9df9708a2ab3e89e78 clamav-0.90.3-20070531_kolab.ix86-debian3.1-kolab.rpm
53097670b452fdab2c20193d27d1c479 clamav-0.90.3-20070531_kolab.src.rpm
The package can be installed on your Kolab Server with
# /kolab/bin/openpkg rpm --rebuild clamav-0.90.3-20070531_kolab.src.rpm
# /kolab/bin/openpkg rpm \
-Uvh /kolab/RPM/PKG/clamav-0.90.3-20070531_kolab.<ARCH>-<OS>-kolab.rpm
# su - kolab-r
$ freshclam
Details
~~~~~~~
http://sourceforge.net/project/shownotes.php?release_id=512356
ClamAV 0.90.3 release notes
Timeline
~~~~~~~~
20070530 ClamAV release 0.90.3.
20070531 OpenPKG 0.90.3 package release.
20070601 Kolab Server security advisory published.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFGYEUqW7P1GVgWeRoRAi5jAJ4zw3zAH6qcg2Z3p3aMBewaayEntwCghcvi
uQqR9EIOgrBcdgjdrp8Cnow=
=UJ7k
-----END PGP SIGNATURE-----
From cvs at kolab.org Fri Jun 1 18:21:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 1 Jun 2007 18:21:31 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.118,1.119
Message-ID: <20070601162131.0C685614433@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv30640
Modified Files:
index.html.m4
Log Message:
Security Issue 15 for Kolab Server (ClamAV)
Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- index.html.m4 10 May 2007 14:22:56 -0000 1.118
+++ index.html.m4 1 Jun 2007 16:21:29 -0000 1.119
@@ -48,6 +48,20 @@
<table>
+<tr><td class="newsd">June 1st, 2007</td>
+<td class="newsh">»
+ Security Issue 15 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+ Some vulnerabilities were found in the Clam AntiVirus package.
+ A new ClamAV RPM with a fix is available. See the
+ <a href="security/kolab-vendor-notice-15.txt">Kolab Security Issue 15</a> for details.
+</div>
+<p>
+
+
+<table>
<tr><td class="newsd">May 10th, 2007</td>
<td class="newsh">»
Kolab Server 2.1.0 Final released
From cvs at kolab.org Mon Jun 4 08:38:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 4 Jun 2007 08:38:02 +0200 (CEST)
Subject: martin: server/kolabd/kolabd/templates example.conf.template, NONE,
1.1
Message-ID: <20070604063802.25DEC61442C@lists.intevation.de>
Author: martin
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv2934/kolabd/kolabd/templates
Added Files:
example.conf.template
Log Message:
--- NEW FILE: example.conf.template ---
KOLAB_META_START
TARGET=/kolab/etc/example.conf
PERMISSIONS=0640
OWNERSHIP=kolab:kolab-n
RUNONCHANGE=echo example >> /tmp/example
KOLAB_META_END
example
foo=bar
zip=zap
From cvs at kolab.org Mon Jun 4 08:41:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 4 Jun 2007 08:41:12 +0200 (CEST)
Subject: martin: server/perl-kolab/Kolab-Conf Conf.pm.in,1.10,1.11
Message-ID: <20070604064112.1463561442C@lists.intevation.de>
Author: martin
Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv2989
Modified Files:
Conf.pm.in
Log Message:
Martin Konold: Added support for running explicit command on change as definable in template https://intevation.de/roundup/kolab/issue1679?
Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Conf.pm.in 6 Jan 2007 21:36:20 -0000 1.10
+++ Conf.pm.in 4 Jun 2007 06:41:10 -0000 1.11
@@ -75,6 +75,7 @@
my %templates = ();
my %ownership = ();
my %permissions = ();
+my %templatehaschanged = ();
# my %templates = (
# "$templatedir/rc.conf.template" => "@sysconfdir@/rc.conf",
@@ -339,6 +340,10 @@
$Kolab::haschanged{'amavisd'} = 1;
} elsif ($cfg =~ /clamav/) {
$Kolab::haschanged{'clamav'} = 1;
+#} elsif ($cfg =~ /example/) {
+ } else {
+ Kolab::log('T', "`$cfg' change detected ", KOLAB_DEBUG );
+ $templatehaschanged{$tmpl} = 1;
}
Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG );
@@ -730,7 +735,7 @@
sub loadMetaTemplates
{
my $templatedir = shift;
- my ($tref, $pref, $oref) = @_;
+ my ($tref, $pref, $oref, $cmdref) = @_;
Kolab::log('T', 'Collecting template files', KOLAB_DEBUG );
opendir(DIR, $templatedir) or Kolab::log('T', 'Given templatedir $templatedir does not exist!', KOLAB_ERROR );
@@ -738,6 +743,7 @@
closedir(DIR);
foreach my $template (@metatemplates) {
+ my $runonchange = undef;
#Open each file and check for the META
if (open (TEMPLATE, "$templatedir/$template" )) {
my $line = <TEMPLATE>;
@@ -746,6 +752,7 @@
my ($found_end, $target, $permissions, $ownership);
while (<TEMPLATE>) {
$line = $_;
+
if (!$found_end) {
$found_end = $line =~ /^KOLAB_META_END$/;
if (!$found_end && $line) {
@@ -764,6 +771,11 @@
$ownership = $value;
Kolab::log('T', 'META Ownership '.$ownership, KOLAB_DEBUG );
}
+ if ($key =~ /^RUNONCHANGE$/) {
+ $runonchange = $value;
+ Kolab::log('T', 'META Cmd to execute '.$runonchange, KOLAB_DEBUG );
+ }
+
}
}
}
@@ -773,6 +785,8 @@
$$oref{$target} = $ownership;
$permissions = oct($permissions);
$$pref{$target} = $permissions;
+ my $runcmdtemplate = $templatedir."/".$template;
+ $$cmdref{$runcmdtemplate} = $runonchange if (defined $runonchange);
}
}
@@ -788,12 +802,13 @@
my $key;
my $value;
my $section="";
+ my %runonchange;
Kolab::log('T', 'Regenerating configuration files', KOLAB_DEBUG );
Kolab::log('T', 'Loading meta-template data', KOLAB_DEBUG );
- loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership );
+ loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership, \%runonchange );
foreach $key (keys %templates) {
my $tpl = $templates{$key};
@@ -809,6 +824,16 @@
buildCyrusGroups;
Kolab::log('T', 'Finished regenerating configuration files', KOLAB_DEBUG );
+
+ foreach $key (keys %runonchange) {
+ if (defined $templatehaschanged{$key})
+ {
+ Kolab::log('T', 'Actioning RUNONCHANGE for $key', KOLAB_DEBUG );
+ my $cmd = $runonchange{$key};
+ system($cmd);
+ Kolab::log('T', 'Executing command', KOLAB_DEBUG );
+ }
+ }
}
sub checkPermissions {
@@ -869,7 +894,7 @@
Portions based on work by the following people:
(c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
- (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+ (c) 2003,2004,255,2006,2007 Martin Konold <martin.konold at erfrakon.de>
(c) 2003 Achim Frank <achim.frank at erfrakon.de>
This program is free software; you can redistribute it and/or
From cvs at kolab.org Tue Jun 5 11:46:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 5 Jun 2007 11:46:52 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
freebusy.class.php.in, 1.12, 1.13
Message-ID: <20070605094652.09D77614478@lists.intevation.de>
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv22122
Modified Files:
freebusy.class.php.in
Log Message:
added location to xpfb events
Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- freebusy.class.php.in 2 May 2007 23:43:20 -0000 1.12
+++ freebusy.class.php.in 5 Jun 2007 09:46:49 -0000 1.13
@@ -276,6 +276,9 @@
if( !empty($event['scheduling-id']) ) {
$extra['X-SID'] = base64_encode($event['scheduling-id']);
}
+ if( !empty($event['location'])) {
+ $extra['X-LOCATION'] = base64_encode($event['location']);
+ }
if( array_key_exists( 'recurrence', $event ) ) {
myLog("Detected recurring event $uid", RM_LOG_DEBUG);
From cvs at kolab.org Tue Jun 5 11:50:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 5 Jun 2007 11:50:00 +0200 (CEST)
Subject: thomas: utils/admin generatefb.php,1.3,1.4
Message-ID: <20070605095000.690FB614478@lists.intevation.de>
Author: thomas
Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv22192
Modified Files:
generatefb.php
Log Message:
Turn off memory limit for regenerating free/busy cache.
The default apache/php.ini already has safe_mode turned off,
so it works out of the box.
Index: generatefb.php
===================================================================
RCS file: /kolabrepository/utils/admin/generatefb.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- generatefb.php 23 May 2007 14:35:40 -0000 1.3
+++ generatefb.php 5 Jun 2007 09:49:58 -0000 1.4
@@ -1,6 +1,7 @@
#!/kolab/bin/php -c/kolab/etc/apache/php.ini
<?php
error_reporting(E_ALL);
+ini_set('memory_limit', -1); /* requires safe_mode to be turned off */
$kolab_prefix = '/kolab';
$kolab_includepath = $kolab_prefix.'/var/kolab/php:'.$kolab_prefix.'/var/kolab/php/pear';
From cvs at kolab.org Tue Jun 5 12:17:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 5 Jun 2007 12:17:01 +0200 (CEST)
Subject: thomas: server obmtool.conf,1.255,1.256
Message-ID: <20070605101701.B428C61447B@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23101
Modified Files:
obmtool.conf
Log Message:
Add +cvs to obmtool.conf version number
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- obmtool.conf 1 Jun 2007 15:42:41 -0000 1.255
+++ obmtool.conf 5 Jun 2007 10:16:59 -0000 1.256
@@ -24,7 +24,7 @@
%kolab
echo "---- boot/build ${NODE} %${CMD} ----"
- kolab_version="2.1.0";
+ kolab_version="2.1.0+cvs";
PREFIX=/${CMD};
loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
plusloc='+'
From cvs at kolab.org Tue Jun 5 13:00:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 5 Jun 2007 13:00:00 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates slapd.conf.template.in, 1.12,
1.13
Message-ID: <20070605110000.85BCC614478@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv23942/kolabd/kolabd/templates
Modified Files:
slapd.conf.template.in
Log Message:
Increase slapd idletimeout for free/busy regeneration (kolab/issue1693)
Running generatefb.php accessed the LDAP for each user.
Generating pfb files can take some time for a single user if he has
many appointments.
Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- slapd.conf.template.in 7 May 2007 20:20:52 -0000 1.12
+++ slapd.conf.template.in 5 Jun 2007 10:59:58 -0000 1.13
@@ -48,8 +48,9 @@
cachesize 10000
checkpoint 512 5
idlcachesize 10000
-idletimeout 80 # The value can be increased if some clients develop problems.
- # Please report to kolab-devel at kolab.org if you encounter such a client.
+idletimeout 300 # The value can be increased if some clients develop
+ # problems. Please report to kolab-devel at kolab.org
+ # if you encounter such a client.
dirtyread
directory @ldapserver_dir@
From cvs at kolab.org Tue Jun 5 14:18:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 5 Jun 2007 14:18:58 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.123,1.124
Message-ID: <20070605121858.5E62861448B@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv26817
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.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- release-notes.txt 1 Jun 2007 15:42:41 -0000 1.123
+++ release-notes.txt 5 Jun 2007 12:18:56 -0000 1.124
@@ -40,6 +40,7 @@
kolab/issue919 (kolab server has problems with some characters in passwords)
kolab/issue1126 (ldap_simple_bind() failed and Domain/Realm not available) - partial fix
+ kolab/issue1693 (Automatically trigger f/b cache regeneration)
- kolab-resource-handlers-2.1.0-2007????
@@ -54,6 +55,7 @@
kolab/issue1620 (fix invalid XHTML in form.class.php)
kolab/issue1742 (Do not modify the objectclasses of an existing object)
kolab/issue1744 (No "User Deleted, awaiting cleanup" for admins and domain maintainers)
+
Changes between 2.1-rc-2 and 2.1.0:
From cvs at kolab.org Tue Jun 5 14:38:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 5 Jun 2007 14:38:47 +0200 (CEST)
Subject: thomas: server README.1st,1.57,1.58 release-notes.txt,1.124,1.125
Message-ID: <20070605123847.A10FB614484@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv30868
Modified Files:
README.1st release-notes.txt
Log Message:
updated README and release notes
Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- README.1st 10 May 2007 10:17:37 -0000 1.57
+++ README.1st 5 Jun 2007 12:38:45 -0000 1.58
@@ -290,6 +290,14 @@
Nothing special has to be done for this upgrade.
+Upgrade from 2.1.0
+------------------
+
+The free/busy cache should be regenerated if you need the 'location' entry
+in extended free/busy lists.
+FIXME: describe generatefb.php
+
+
Known problems and workarounds
------------------------------
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- release-notes.txt 5 Jun 2007 12:18:56 -0000 1.124
+++ release-notes.txt 5 Jun 2007 12:38:45 -0000 1.125
@@ -36,13 +36,20 @@
New upstream version, fixes various security issues.
+ - perl-kolab-5.8.7-2007????
+
+ kolab/issue1679 (Update template META mechanism to support service restarts)
+
- kolabd-2.1.0-2007????
kolab/issue919 (kolab server has problems with some characters in passwords)
kolab/issue1126 (ldap_simple_bind() failed and Domain/Realm not available) - partial fix
+ kolab/issue1679 (Update template META mechanism to support service restarts)
kolab/issue1693 (Automatically trigger f/b cache regeneration)
- kolab-resource-handlers-2.1.0-2007????
+
+ added location to xpfb events
kolab/issue1693 (Automatically trigger f/b cache regeneration)
From aron20012004 at ya.com Sat Jun 9 22:55:01 2007
From: aron20012004 at ya.com (=?iso-8859-1?q?Ar=F3n?=)
Date: Sat, 9 Jun 2007 22:55:01 +0200
Subject: Translating Spanish PO File
Message-ID: <200706092255.02174.aron20012004@ya.com>
Hello.
My name is Ar?n and I'm from Spain.
I'm translating the PO file to Spanish Language.
It's my first translation, so I hope I am doing it well.
How can I send you my modified PO file to help in the translation?
Thank you.
From cvs at kolab.org Fri Jun 15 10:21:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Jun 2007 10:21:59 +0200 (CEST)
Subject: bernhard: doc/www/src documentation.html.m4,1.29,1.30
Message-ID: <20070615082159.713CF614428@lists.intevation.de>
Author: bernhard
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv16072
Modified Files:
documentation.html.m4
Log Message:
documentation: clarified that the German doc2 might be older then the original.
Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- documentation.html.m4 25 Apr 2007 17:53:38 -0000 1.29
+++ documentation.html.m4 15 Jun 2007 08:21:57 -0000 1.30
@@ -13,7 +13,8 @@
<a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/proko2-doc/doc2.sxw"
>CVS HEAD as sxw</a>
- <li>Server and KDE Client Setup Translation Deutsch/German contributed by W. Sorgenfrei:<br>
+ <li>Server and KDE Client Setup Translation Deutsch/German contributed by W. Sorgenfrei. <br>
+ (Might not reflect latest changes of the English original. Compare the revision numbers)<br>
<a href="./doc/doc2-de-1.64.pdf">Doc2-de, Version 1.64 as pdf</a>
|
<a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/proko2-doc/de/doc2-de.sxw"
From cvs at kolab.org Fri Jun 15 12:26:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Jun 2007 12:26:05 +0200 (CEST)
Subject: bernhard: doc/www/src documentation.html.m4,1.30,1.31
Message-ID: <20070615102605.5E36061443D@lists.intevation.de>
Author: bernhard
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv19069/src
Modified Files:
documentation.html.m4
Log Message:
Remark for doc2 description that it is about proko2 branch.
Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- documentation.html.m4 15 Jun 2007 08:21:57 -0000 1.30
+++ documentation.html.m4 15 Jun 2007 10:26:03 -0000 1.31
@@ -7,7 +7,7 @@
<h3>Setup</h3>
<ul>
- <li>Server and KDE Client Setup (aka Doc2, pdf: 2.5MB, sxw: 1.9MB):<br>
+ <li>Server and KDE Client "Proko2 Branch" Setup (aka Doc2, pdf: 2.5MB, sxw: 1.9MB):<br>
<a href="./doc/doc2-1.70.pdf">Doc2, Version 1.70 as pdf</a>
|
<a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/proko2-doc/doc2.sxw"
From cvs at kolab.org Fri Jun 15 15:11:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Jun 2007 15:11:19 +0200 (CEST)
Subject: thomas: server README.1st,1.58,1.59
Message-ID: <20070615131119.B346B614436@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23250
Modified Files:
README.1st
Log Message:
Add kolab/issue1795 to known problems section.
(bootstrap fails to start slapd with Kolab 2.1.0 binary packages on Linux 2.4 kernel)
Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- README.1st 5 Jun 2007 12:38:45 -0000 1.58
+++ README.1st 15 Jun 2007 13:11:17 -0000 1.59
@@ -336,6 +336,10 @@
See kolab/issue1607 (need to replace gdbm for pfbcache, because of
license clash gdbm vs php) for details.
+ - /kolab/etc/kolab/kolab_bootstrap -b fails to start the temporary
+ slapd on Linux 2.4 kernels if binaries compiled on Linux 2.6 (as
+ provided on kolab.org) are used. See kolab/issue1795 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 Tue Jun 19 08:29:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Jun 2007 08:29:11 +0200 (CEST)
Subject: martin: server/kolabd/kolabd/dist_conf debian,1.8,1.9
Message-ID: <20070619062911.CB266614437@lists.intevation.de>
Author: martin
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv28944
Modified Files:
debian
Log Message:
Martin Konold: https://intevation.de/roundup/kolab/issue1800 applied fix for debian port.
Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- debian 9 Mar 2006 21:52:02 -0000 1.8
+++ debian 19 Jun 2007 06:29:09 -0000 1.9
@@ -83,7 +83,7 @@
kolab_pidfile=${sysrundir}/kolab.pid
kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
kolab_scriptsdir=$(sysconfdir)/kolab
-kolab_php_smarty_prefix=Smarty
+kolab_php_smarty_prefix=smarty/libs
ldapserver_statedir=${localstatedir}/lib/ldap
ldapserver_dir=${localstatedir}/lib/ldap
From cvs at kolab.org Thu Jun 21 16:37:36 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Jun 2007 16:37:36 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd ChangeLog, 1.95, 1.96 Makefile.am, 1.22,
1.23
Message-ID: <20070621143736.893F161443D@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv22073
Modified Files:
ChangeLog Makefile.am
Log Message:
fixed kolab/issue1805 (Uncleaned files in kolabd source package)
Added missing Makefile dependencies (pointed out by Peter Eisentraut)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- ChangeLog 11 May 2007 10:06:19 -0000 1.95
+++ ChangeLog 21 Jun 2007 14:37:34 -0000 1.96
@@ -1,3 +1,10 @@
+2007-06-21 Marcus Hüwe <suse-tux at gmx.de>
+
+ * Makefile.am:
+
+ fixed kolab/issue1805 (Uncleaned files in kolabd source package)
+ Added missing Makefile dependencies (pointed out by Peter Eisentraut)
+
2007-05-11 Gunnar Wrobel <p at rdus.de>
* templates/saslauthd.conf.template.in (ldap_bind_pw):
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile.am 7 May 2007 20:20:52 -0000 1.22
+++ Makefile.am 21 Jun 2007 14:37:34 -0000 1.23
@@ -91,8 +91,7 @@
kolabnamespacedir = $(libexecdir)/kolab
kolabnamespace_DATA = $(kolabnamespace_FILES)
-EXTRA_DIST += namespace/libexec/start
-EXTRA_DIST += namespace/libexec/stop
+
ldapschema_FILES = kolab2.schema \
horde.schema \
@@ -125,18 +124,21 @@
amavisddedir = $(amavisd_templatedir)/de
dist_amavisdde_DATA = $(amavisdde_FILES)
-kolabdoc_FILES = doc/README.amavisd \
- doc/README.ldapdelete \
+
+kolabdoc_FILES = doc/README.ldapdelete \
doc/README.outlook \
doc/README.sieve \
- doc/README.webgui \
ChangeLog \
COPYING \
NEWS \
AUTHORS
kolabdocdir = $(pkgdocdir)/@PACKAGE@
-dist_kolabdoc_DATA = $(kolabdoc_FILES)
+kolabdoc_DATA = $(kolabdoc_FILES) \
+ doc/README.amavisd \
+ doc/README.webgui
+EXTRA_DIST += $(kolabdoc_FILES)
+
if OPENPKG
kolabsbin_FILES = kolabd \
@@ -151,7 +153,6 @@
kolabsbindir = $(sbindir)/
kolabsbin_DATA = $(kolabsbin_FILES)
-EXTRA_DIST += kolabcheckperm
kolabbindir = $(bindir)
@@ -169,364 +170,364 @@
endif
-kolab:
+kolab: kolab.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab.in >$@
chmod a+x kolab
CLEANFILES += kolab
EXTRA_DIST += kolab.in
-kolab_ca.sh:
+kolab_ca.sh: kolab_ca.sh.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_ca.sh.in >$@
chmod a+x kolab_ca.sh
CLEANFILES += kolab_ca.sh
EXTRA_DIST += kolab_ca.sh.in
-kolab_bootstrap:
+kolab_bootstrap: kolab_bootstrap.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_bootstrap.in >$@
chmod a+x kolab_bootstrap
CLEANFILES += kolab_bootstrap
EXTRA_DIST += kolab_bootstrap.in
-kolab_sslcert.sh:
+kolab_sslcert.sh: kolab_sslcert.sh.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_sslcert.sh.in >$@
chmod a+x kolab_sslcert.sh
CLEANFILES += kolab_sslcert.sh
EXTRA_DIST += kolab_sslcert.sh.in
-kolabconf:
+kolabconf: kolabconf.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabconf.in >$@
chmod a+x kolabconf
CLEANFILES += kolabconf
EXTRA_DIST += kolabconf.in
-kolabcheckperm:
+kolabcheckperm: kolabcheckperm.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabcheckperm.in >$@
CLEANFILES += kolabcheckperm
EXTRA_DIST += kolabcheckperm.in
-kolabd:
+kolabd: kolabd.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabd.in >$@
chmod a+x kolabd
CLEANFILES += kolabd
EXTRA_DIST += kolabd.in
-kolabpasswd:
+kolabpasswd: kolabpasswd.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabpasswd.in >$@
chmod a+x kolabpasswd
CLEANFILES += kolabpasswd
EXTRA_DIST += kolabpasswd.in
-kolabquotawarn:
+kolabquotawarn: kolabquotawarn.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabquotawarn.in >$@
chmod a+x kolabquotawarn
CLEANFILES += kolabquotawarn
EXTRA_DIST += kolabquotawarn.in
-namespace/libexec/adduser:
+namespace/libexec/adduser: namespace/libexec/adduser.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/adduser.in >$@
chmod a+x namespace/libexec/adduser
CLEANFILES += namespace/libexec/adduser
EXTRA_DIST += namespace/libexec/adduser.in
-namespace/libexec/deluser:
+namespace/libexec/deluser: namespace/libexec/deluser.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/deluser.in >$@
chmod a+x namespace/libexec/deluser
CLEANFILES += namespace/libexec/deluser
EXTRA_DIST += namespace/libexec/deluser.in
-namespace/libexec/listusers:
+namespace/libexec/listusers: namespace/libexec/listusers.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/listusers.in >$@
chmod a+x namespace/libexec/listusers
CLEANFILES += namespace/libexec/listusers
EXTRA_DIST += namespace/libexec/listusers.in
-namespace/libexec/newconfig:
+namespace/libexec/newconfig: namespace/libexec/newconfig.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/newconfig.in >$@
chmod a+x namespace/libexec/newconfig
CLEANFILES += namespace/libexec/newconfig
EXTRA_DIST += namespace/libexec/newconfig.in
-namespace/libexec/services:
+namespace/libexec/services: namespace/libexec/services.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/services.in >$@
chmod a+x namespace/libexec/services
CLEANFILES += namespace/libexec/services
EXTRA_DIST += namespace/libexec/services.in
-namespace/libexec/showlog:
+namespace/libexec/showlog: namespace/libexec/showlog.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/showlog.in >$@
chmod a+x namespace/libexec/showlog
CLEANFILES += namespace/libexec/showlog
EXTRA_DIST += namespace/libexec/showlog.in
-namespace/libexec/showuser:
+namespace/libexec/showuser: namespace/libexec/showuser.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/showuser.in >$@
chmod a+x namespace/libexec/showuser
CLEANFILES += namespace/libexec/showuser
EXTRA_DIST += namespace/libexec/showuser.in
-namespace/libexec/start:
+namespace/libexec/start: namespace/libexec/start.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/start.in >$@
chmod a+x namespace/libexec/start
CLEANFILES += namespace/libexec/start
EXTRA_DIST += namespace/libexec/start.in
-namespace/libexec/stop:
+namespace/libexec/stop: namespace/libexec/stop.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/stop.in >$@
chmod a+x namespace/libexec/stop
CLEANFILES += namespace/libexec/stop
EXTRA_DIST += namespace/libexec/stop.in
-namespace/kolab:
+namespace/kolab: namespace/kolab.in
@$(mkinstalldirs) namespace/
$(do_subst) <$(srcdir)/namespace/kolab.in >$@
chmod a+x namespace/kolab
CLEANFILES += namespace/kolab
EXTRA_DIST += namespace/kolab.in
-templates/clamd.conf.template:
+templates/clamd.conf.template: templates/clamd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/clamd.conf.template.in >$@
CLEANFILES += templates/clamd.conf.template
EXTRA_DIST += templates/clamd.conf.template.in
-templates/cyrus.conf.template:
+templates/cyrus.conf.template: templates/cyrus.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/cyrus.conf.template.in >$@
CLEANFILES += templates/cyrus.conf.template
EXTRA_DIST += templates/cyrus.conf.template.in
-templates/DB_CONFIG.slapd.template:
+templates/DB_CONFIG.slapd.template: templates/DB_CONFIG.slapd.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/DB_CONFIG.slapd.template.in >$@
CLEANFILES += templates/DB_CONFIG.slapd.template
EXTRA_DIST += templates/DB_CONFIG.slapd.template.in
-templates/fbview.conf.template:
+templates/fbview.conf.template: templates/fbview.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/fbview.conf.template.in >$@
CLEANFILES += templates/fbview.conf.template
EXTRA_DIST += templates/fbview.conf.template.in
-templates/freebusy.conf.template:
+templates/freebusy.conf.template: templates/freebusy.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/freebusy.conf.template.in >$@
CLEANFILES += templates/freebusy.conf.template
EXTRA_DIST += templates/freebusy.conf.template.in
-templates/freshclam.conf.template:
+templates/freshclam.conf.template: templates/freshclam.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/freshclam.conf.template.in >$@
CLEANFILES += templates/freshclam.conf.template
EXTRA_DIST += templates/freshclam.conf.template.in
-templates/httpd.conf.template:
+templates/httpd.conf.template: templates/httpd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/httpd.conf.template.in >$@
CLEANFILES += templates/httpd.conf.template
EXTRA_DIST += templates/httpd.conf.template.in
-templates/httpd.local.template:
+templates/httpd.local.template: templates/httpd.local.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/httpd.local.template.in >$@
CLEANFILES += templates/httpd.local.template
EXTRA_DIST += templates/httpd.local.template.in
-templates/imapd.conf.template:
+templates/imapd.conf.template: templates/imapd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/imapd.conf.template.in >$@
CLEANFILES += templates/imapd.conf.template
EXTRA_DIST += templates/imapd.conf.template.in
-templates/imapd.group.template:
+templates/imapd.group.template: templates/imapd.group.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/imapd.group.template.in >$@
CLEANFILES += templates/imapd.group.template
EXTRA_DIST += templates/imapd.group.template.in
-templates/kolab.conf.template:
+templates/kolab.conf.template: templates/kolab.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/kolab.conf.template.in >$@
CLEANFILES += templates/kolab.conf.template
EXTRA_DIST += templates/kolab.conf.template.in
-templates/ldap.conf.template:
+templates/ldap.conf.template: templates/ldap.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/ldap.conf.template.in >$@
CLEANFILES += templates/ldap.conf.template
EXTRA_DIST += templates/ldap.conf.template.in
-templates/ldapdistlist.cf.template:
+templates/ldapdistlist.cf.template: templates/ldapdistlist.cf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/ldapdistlist.cf.template.in >$@
CLEANFILES += templates/ldapdistlist.cf.template
EXTRA_DIST += templates/ldapdistlist.cf.template.in
-templates/ldaptransport.cf.template:
+templates/ldaptransport.cf.template: templates/ldaptransport.cf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/ldaptransport.cf.template.in >$@
CLEANFILES += templates/ldaptransport.cf.template
EXTRA_DIST += templates/ldaptransport.cf.template.in
-templates/ldapvirtual.cf.template:
+templates/ldapvirtual.cf.template: templates/ldapvirtual.cf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/ldapvirtual.cf.template.in >$@
CLEANFILES += templates/ldapvirtual.cf.template
EXTRA_DIST += templates/ldapvirtual.cf.template.in
-templates/main.cf.template:
+templates/main.cf.template: templates/main.cf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/main.cf.template.in >$@
CLEANFILES += templates/main.cf.template
EXTRA_DIST += templates/main.cf.template.in
-templates/master.cf.template:
+templates/master.cf.template: templates/master.cf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/master.cf.template.in >$@
CLEANFILES += templates/master.cf.template
EXTRA_DIST += templates/master.cf.template.in
-templates/kolab_smtpdpolicy.conf.template:
+templates/kolab_smtpdpolicy.conf.template: templates/kolab_smtpdpolicy.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/kolab_smtpdpolicy.conf.template.in >$@
CLEANFILES += templates/kolab_smtpdpolicy.conf.template
EXTRA_DIST += templates/kolab_smtpdpolicy.conf.template.in
-templates/php.ini.template:
+templates/php.ini.template: templates/php.ini.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/php.ini.template.in >$@
CLEANFILES += templates/php.ini.template
EXTRA_DIST += templates/php.ini.template.in
-templates/proftpd.conf.template:
+templates/proftpd.conf.template: templates/proftpd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/proftpd.conf.template.in >$@
CLEANFILES += templates/proftpd.conf.template
EXTRA_DIST += templates/proftpd.conf.template.in
-templates/rc.conf.template:
+templates/rc.conf.template: templates/rc.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/rc.conf.template.in >$@
CLEANFILES += templates/rc.conf.template
EXTRA_DIST += templates/rc.conf.template.in
-templates/resmgr.conf.template:
+templates/resmgr.conf.template: templates/resmgr.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/resmgr.conf.template.in >$@
CLEANFILES += templates/resmgr.conf.template
EXTRA_DIST += templates/resmgr.conf.template.in
-templates/saslauthd.conf.template:
+templates/saslauthd.conf.template: templates/saslauthd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/saslauthd.conf.template.in >$@
CLEANFILES += templates/saslauthd.conf.template
EXTRA_DIST += templates/saslauthd.conf.template.in
-templates/session_vars.php.template:
+templates/session_vars.php.template: templates/session_vars.php.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/session_vars.php.template.in >$@
CLEANFILES += templates/session_vars.php.template
EXTRA_DIST += templates/session_vars.php.template.in
-templates/slapd.access.template:
+templates/slapd.access.template: templates/slapd.access.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/slapd.access.template.in >$@
CLEANFILES += templates/slapd.access.template
EXTRA_DIST += templates/slapd.access.template.in
-templates/slapd.conf.template:
+templates/slapd.conf.template: templates/slapd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/slapd.conf.template.in >$@
CLEANFILES += templates/slapd.conf.template
EXTRA_DIST += templates/slapd.conf.template.in
-templates/slapd.replicas.template:
+templates/slapd.replicas.template: templates/slapd.replicas.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/slapd.replicas.template.in >$@
CLEANFILES += templates/slapd.replicas.template
EXTRA_DIST += templates/slapd.replicas.template.in
-templates/smtpd.conf.template:
+templates/smtpd.conf.template: templates/smtpd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/smtpd.conf.template.in >$@
CLEANFILES += templates/smtpd.conf.template
EXTRA_DIST += templates/smtpd.conf.template.in
-templates/transport.template:
+templates/transport.template: templates/transport.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/transport.template.in >$@
CLEANFILES += templates/transport.template
EXTRA_DIST += templates/transport.template.in
-templates/virtual.template:
+templates/virtual.template: templates/virtual.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/virtual.template.in >$@
CLEANFILES += templates/virtual.template
EXTRA_DIST += templates/virtual.template.in
-templates/amavisd.conf.template:
+templates/amavisd.conf.template: templates/amavisd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/amavisd.conf.template.in >$@
CLEANFILES += templates/amavisd.conf.template
EXTRA_DIST += templates/amavisd.conf.template.in
-workaround.sh:
+workaround.sh: workaround.sh.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/workaround.sh.in >$@
chmod a+x workaround.sh
CLEANFILES += workaround.sh
EXTRA_DIST += workaround.sh.in
-kolab_upgrade:
+kolab_upgrade: kolab_upgrade.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_upgrade.in >$@
chmod a+x kolab_upgrade
CLEANFILES += kolab_upgrade
EXTRA_DIST += kolab_upgrade.in
-kolab_smtpdpolicy:
+kolab_smtpdpolicy: kolab_smtpdpolicy.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_smtpdpolicy.in >$@
chmod a+x kolab_smtpdpolicy
CLEANFILES += kolab_smtpdpolicy
EXTRA_DIST += kolab_smtpdpolicy.in
-doc/README.amavisd:
+doc/README.amavisd: doc/README.amavisd.in
@$(mkinstalldirs) doc
$(do_subst) <$(srcdir)/doc/README.amavisd.in >$@
CLEANFILES += doc/README.amavisd
EXTRA_DIST += doc/README.amavisd.in
-doc/README.webgui:
+doc/README.webgui: doc/README.webgui.in
@$(mkinstalldirs) doc
$(do_subst) <$(srcdir)/doc/README.webgui.in >$@
CLEANFILES += doc/README.webgui
EXTRA_DIST += doc/README.webgui.in
-rc.kolabd:
+rc.kolabd: rc.kolabd.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/rc.kolabd.in >$@
CLEANFILES += rc.kolabd
EXTRA_DIST += rc.kolabd.in
-dist_conf/kolabsrv:
+dist_conf/kolabsrv: dist_conf/kolabsrv.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/dist_conf/kolabsrv.in >$@
CLEANFILES += dist_conf/kolabsrv
From cvs at kolab.org Thu Jun 21 16:48:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Jun 2007 16:48:26 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd ChangeLog, 1.96, 1.97 kolabd.spec.in, 1.8,
1.9
Message-ID: <20070621144826.BF93561443D@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv22581
Modified Files:
ChangeLog kolabd.spec.in
Log Message:
removed "rm -rf $RPM_BUILD_ROOT" from the %install section as this opens a possible race condition (see http://lists.opensuse.org/opensuse-packaging/2007-02/msg00005.html for more information)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- ChangeLog 21 Jun 2007 14:37:34 -0000 1.96
+++ ChangeLog 21 Jun 2007 14:48:24 -0000 1.97
@@ -5,6 +5,12 @@
fixed kolab/issue1805 (Uncleaned files in kolabd source package)
Added missing Makefile dependencies (pointed out by Peter Eisentraut)
+ * kolabd.spec.in:
+
+ removed "rm -rf $RPM_BUILD_ROOT" from the %install section as this opens
+ a possible race condition (see http://lists.opensuse.org/opensuse-packaging/2007-02/msg00005.html
+ for more information)
+
2007-05-11 Gunnar Wrobel <p at rdus.de>
* templates/saslauthd.conf.template.in (ldap_bind_pw):
Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolabd.spec.in 20 Apr 2007 14:56:10 -0000 1.8
+++ kolabd.spec.in 21 Jun 2007 14:48:24 -0000 1.9
@@ -92,7 +92,6 @@
%{l_make} %{l_mflags}
%install
- rm -rf $RPM_BUILD_ROOT
# install package
%{l_make} %{l_mflags} install \
From cvs at kolab.org Thu Jun 21 19:03:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Jun 2007 19:03:14 +0200 (CEST)
Subject: marcus: server/kolab-resource-handlers/kolab-resource-handlers
ChangeLog, 1.33, 1.34 Makefile.am, 1.9, 1.10
Message-ID: <20070621170314.D0987614438@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers
In directory doto:/tmp/cvs-serv27257
Modified Files:
ChangeLog Makefile.am
Log Message:
added Makefile dependencies
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ChangeLog 7 May 2007 11:16:58 -0000 1.33
+++ ChangeLog 21 Jun 2007 17:03:12 -0000 1.34
@@ -1,3 +1,7 @@
+2007-06-21 Marcus Hüwe <suse-tux at gmx.de>
+
+ * Makefile.am: added Makefile dependencies
+
2007-05-07 Thomas Arendsen Hein <thomas at intevation.de>
* resmgr/olhacks.php.in: Generate a single To: header listing all
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am 25 Oct 2006 02:28:57 -0000 1.9
+++ Makefile.am 21 Jun 2007 17:03:12 -0000 1.10
@@ -58,58 +58,58 @@
NEWS \
AUTHORS
-freebusy/freebusy.php:
+freebusy/freebusy.php: freebusy/freebusy.php.in
@$(mkinstalldirs) freebusy
$(do_subst) <$(srcdir)/freebusy/freebusy.php.in >$@
CLEANFILES += freebusy/freebusy.php
EXTRA_DIST += freebusy/freebusy.php.in
-freebusy/freebusycache.class.php:
+freebusy/freebusycache.class.php: freebusy/freebusycache.class.php.in
@$(mkinstalldirs) freebusy
$(do_subst) <$(srcdir)/freebusy/freebusycache.class.php.in >$@
CLEANFILES += freebusy/freebusycache.class.php
EXTRA_DIST += freebusy/freebusycache.class.php.in
-freebusy/freebusy.class.php:
+freebusy/freebusy.class.php: freebusy/freebusy.class.php.in
@$(mkinstalldirs) freebusy
$(do_subst) <$(srcdir)/freebusy/freebusy.class.php.in >$@
CLEANFILES += freebusy/freebusy.class.php
EXTRA_DIST += freebusy/freebusy.class.php.in
-freebusy/pfb.php:
+freebusy/pfb.php: freebusy/pfb.php.in
@$(mkinstalldirs) freebusy
$(do_subst) <$(srcdir)/freebusy/pfb.php.in >$@
CLEANFILES += freebusy/pfb.php
EXTRA_DIST += freebusy/pfb.php.in
-resmgr/kolabfilter.php:
+resmgr/kolabfilter.php: resmgr/kolabfilter.php.in
@$(mkinstalldirs) resmgr
$(do_subst) <$(srcdir)/resmgr/kolabfilter.php.in > $@
chmod a+x resmgr/kolabfilter.php
CLEANFILES += resmgr/kolabfilter.php
EXTRA_DIST += resmgr/kolabfilter.php.in
-resmgr/kolabmailboxfilter.php:
+resmgr/kolabmailboxfilter.php: resmgr/kolabmailboxfilter.php.in
@$(mkinstalldirs) resmgr
$(do_subst) <$(srcdir)/resmgr/kolabmailboxfilter.php.in > $@
chmod a+x resmgr/kolabmailboxfilter.php
CLEANFILES += resmgr/kolabmailboxfilter.php
EXTRA_DIST += resmgr/kolabmailboxfilter.php.in
-resmgr/resmgr.conf:
+resmgr/resmgr.conf: resmgr/resmgr.conf.in
@$(mkinstalldirs) resmgr
$(do_subst) <$(srcdir)/resmgr/resmgr.conf.in > $@
CLEANFILES += resmgr/resmgr.conf
EXTRA_DIST += resmgr/resmgr.conf.in
-resmgr/resmgr.php:
+resmgr/resmgr.php: resmgr/resmgr.php.in
@$(mkinstalldirs) resmgr
$(do_subst) <$(srcdir)/resmgr/resmgr.php.in >$@
chmod a+x resmgr/resmgr.php
CLEANFILES += resmgr/resmgr.php
EXTRA_DIST += resmgr/resmgr.php.in
-resmgr/olhacks.php:
+resmgr/olhacks.php: resmgr/olhacks.php.in
@$(mkinstalldirs) resmgr
$(do_subst) <$(srcdir)/resmgr/olhacks.php.in >$@
CLEANFILES += resmgr/olhacks.php
From cvs at kolab.org Thu Jun 21 19:36:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Jun 2007 19:36:17 +0200 (CEST)
Subject: marcus: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.46,
1.47 Makefile.am, 1.39, 1.40 kolab-webadmin.spec.in, 1.17, 1.18
Message-ID: <20070621173617.0DF5C61443D@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv28596
Modified Files:
ChangeLog Makefile.am kolab-webadmin.spec.in
Log Message:
* Makefile.am:
fixed kolab/issue1797 (kolab-webadmin source package missing PO files).
Added Makefile dependencies.
* kolab-webadmin.spec.in:
Removed "rm -rf $RPM_BUILD_ROOT" from the %install section as this opens
a possible race condition (see
http://lists.opensuse.org/opensuse-packaging/2007-02/msg00005.html for
more information)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ChangeLog 29 May 2007 15:12:23 -0000 1.46
+++ ChangeLog 21 Jun 2007 17:36:15 -0000 1.47
@@ -1,3 +1,17 @@
+2007-06-21 Marcus Hüwe <suse-tux at gmx.de>
+
+ * Makefile.am:
+
+ fixed kolab/issue1797 (kolab-webadmin source package missing PO files).
+ Added Makefile dependencies.
+
+ * kolab-webadmin.spec.in:
+
+ Removed "rm -rf $RPM_BUILD_ROOT" from the %install section as this opens
+ a possible race condition (see
+ http://lists.opensuse.org/opensuse-packaging/2007-02/msg00005.html for
+ more information)
+
2007-05-29 Gunnar Wrobel <p at rdus.de>
* www/admin/domainmaintainer/domainmaintainer.php.in:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile.am 24 May 2007 12:12:15 -0000 1.39
+++ Makefile.am 21 Jun 2007 17:36:15 -0000 1.40
@@ -121,7 +121,6 @@
php/admin/templates/userdeleted.tpl \
php/admin/templates/sfdeleted.tpl \
php/admin/templates/distlistdeleted.tpl \
- php/admin/templates/page.tpl \
php/admin/templates/addresslist.tpl \
php/admin/templates/sflistall.tpl \
php/admin/templates/erfrakon.tpl \
@@ -137,7 +136,7 @@
php/admin/templates/distlistall.tpl \
php/admin/templates/kdab.tpl \
php/admin/templates/userlistall.tpl \
- php/admin/templates/userlisterror.tpl \
+ php/admin/templates/userlisterror.tpl \
php/admin/templates/service.tpl \
php/admin/templates/welcome.tpl \
php/admin/templates/systemaliasnagscreen.tpl \
@@ -149,6 +148,7 @@
phptemplatesdir = $(phpkolabdir)/templates
phptemplates_DATA = $(PHP_TEMPLATES) \
+ php/admin/templates/page.tpl \
php/admin/templates/versions.tpl
EXTRA_DIST += $(PHP_TEMPLATES)
@@ -183,11 +183,11 @@
phplocaleitdir = $(localedir)/it/LC_MESSAGES
phplocaleesdir = $(localedir)/es/LC_MESSAGES
-dist_phplocalede_DATA = $(PHP_LOCALE_DE_MO)
-dist_phplocalefr_DATA = $(PHP_LOCALE_FR_MO)
-dist_phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
-dist_phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
-dist_phplocalees_DATA = $(PHP_LOCALE_ES_MO)
+dist_phplocalede_DATA = $(PHP_LOCALE_DE_PO)
+dist_phplocalefr_DATA = $(PHP_LOCALE_FR_PO)
+dist_phplocalenl_DATA = $(PHP_LOCALE_NL_PO)
+dist_phplocaleit_DATA = $(PHP_LOCALE_IT_PO)
+dist_phplocalees_DATA = $(PHP_LOCALE_ES_PO)
kwadocdir = $(pkgdocdir)/@PACKAGE@
dist_kwadoc_DATA = ChangeLog \
@@ -204,182 +204,182 @@
### new
-www/admin/addressbook/addr.php:
+www/admin/addressbook/addr.php: www/admin/addressbook/addr.php.in
@$(mkinstalldirs) www/admin/addressbook
$(do_subst) <$(srcdir)/www/admin/addressbook/addr.php.in >$@
CLEANFILES += www/admin/addressbook/addr.php
EXTRA_DIST += www/admin/addressbook/addr.php.in
-www/admin/addressbook/index.php:
+www/admin/addressbook/index.php: www/admin/addressbook/index.php.in
@$(mkinstalldirs) www/admin/addressbook
$(do_subst) <$(srcdir)/www/admin/addressbook/index.php.in >$@
CLEANFILES += www/admin/addressbook/index.php
EXTRA_DIST += www/admin/addressbook/index.php.in
-www/admin/administrator/admin.php:
+www/admin/administrator/admin.php: www/admin/administrator/admin.php.in
@$(mkinstalldirs) www/admin/administrator
$(do_subst) <$(srcdir)/www/admin/administrator/admin.php.in >$@
CLEANFILES += www/admin/administrator/admin.php
EXTRA_DIST += www/admin/administrator/admin.php.in
-www/admin/administrator/index.php:
+www/admin/administrator/index.php: www/admin/administrator/index.php.in
@$(mkinstalldirs) www/admin/administrator
$(do_subst) <$(srcdir)/www/admin/administrator/index.php.in >$@
CLEANFILES += www/admin/administrator/index.php
EXTRA_DIST += www/admin/administrator/index.php.in
-www/admin/distributionlist/index.php:
+www/admin/distributionlist/index.php: www/admin/distributionlist/index.php.in
@$(mkinstalldirs) www/admin/distributionlist
$(do_subst) <$(srcdir)/www/admin/distributionlist/index.php.in >$@
CLEANFILES += www/admin/distributionlist/index.php
EXTRA_DIST += www/admin/distributionlist/index.php.in
-www/admin/distributionlist/list.php:
+www/admin/distributionlist/list.php: www/admin/distributionlist/list.php.in
@$(mkinstalldirs) www/admin/distributionlist
$(do_subst) <$(srcdir)/www/admin/distributionlist/list.php.in >$@
CLEANFILES += www/admin/distributionlist/list.php
EXTRA_DIST += www/admin/distributionlist/list.php.in
-www/admin/domainmaintainer/domainmaintainer.php:
+www/admin/domainmaintainer/domainmaintainer.php: www/admin/domainmaintainer/domainmaintainer.php.in
@$(mkinstalldirs) www/admin/domainmaintainer
$(do_subst) <$(srcdir)/www/admin/domainmaintainer/domainmaintainer.php.in >$@
CLEANFILES += www/admin/domainmaintainer/domainmaintainer.php
EXTRA_DIST += www/admin/domainmaintainer/domainmaintainer.php.in
-www/admin/domainmaintainer/index.php:
+www/admin/domainmaintainer/index.php: www/admin/domainmaintainer/index.php.in
@$(mkinstalldirs) www/admin/domainmaintainer
$(do_subst) <$(srcdir)/www/admin/domainmaintainer/index.php.in >$@
CLEANFILES += www/admin/domainmaintainer/index.php
EXTRA_DIST += www/admin/domainmaintainer/index.php.in
-www/admin/index.php:
+www/admin/index.php: www/admin/index.php.in
@$(mkinstalldirs) www/admin
$(do_subst) <$(srcdir)/www/admin/index.php.in >$@
CLEANFILES += www/admin/index.php
EXTRA_DIST += www/admin/index.php.in
-www/admin/kolab/codefusion.php:
+www/admin/kolab/codefusion.php: www/admin/kolab/codefusion.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/codefusion.php.in >$@
CLEANFILES += www/admin/kolab/codefusion.php
EXTRA_DIST += www/admin/kolab/codefusion.php.in
-www/admin/kolab/erfrakon.php:
+www/admin/kolab/erfrakon.php: www/admin/kolab/erfrakon.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/erfrakon.php.in >$@
CLEANFILES += www/admin/kolab/erfrakon.php
EXTRA_DIST += www/admin/kolab/erfrakon.php.in
-www/admin/kolab/index.php:
+www/admin/kolab/index.php: www/admin/kolab/index.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/index.php.in >$@
CLEANFILES += www/admin/kolab/index.php
EXTRA_DIST += www/admin/kolab/index.php.in
-www/admin/kolab/intevation.php:
+www/admin/kolab/intevation.php: www/admin/kolab/intevation.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/intevation.php.in >$@
CLEANFILES += www/admin/kolab/intevation.php
EXTRA_DIST += www/admin/kolab/intevation.php.in
-www/admin/kolab/kdab.php:
+www/admin/kolab/kdab.php: www/admin/kolab/kdab.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/kdab.php.in >$@
CLEANFILES += www/admin/kolab/kdab.php
EXTRA_DIST += www/admin/kolab/kdab.php.in
-www/admin/kolab/kde.php:
+www/admin/kolab/kde.php: www/admin/kolab/kde.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/kde.php.in >$@
CLEANFILES += www/admin/kolab/kde.php
EXTRA_DIST += www/admin/kolab/kde.php.in
-www/admin/maintainer/index.php:
+www/admin/maintainer/index.php: www/admin/maintainer/index.php.in
@$(mkinstalldirs) www/admin/maintainer
$(do_subst) <$(srcdir)/www/admin/maintainer/index.php.in >$@
CLEANFILES += www/admin/maintainer/index.php
EXTRA_DIST += www/admin/maintainer/index.php.in
-www/admin/maintainer/maintainer.php:
+www/admin/maintainer/maintainer.php: www/admin/maintainer/maintainer.php.in
@$(mkinstalldirs) www/admin/maintainer
$(do_subst) <$(srcdir)/www/admin/maintainer/maintainer.php.in >$@
CLEANFILES += www/admin/maintainer/maintainer.php
EXTRA_DIST += www/admin/maintainer/maintainer.php.in
-www/admin/service/index.php:
+www/admin/service/index.php: www/admin/service/index.php.in
@$(mkinstalldirs) www/admin/service
$(do_subst) <$(srcdir)/www/admin/service/index.php.in >$@
CLEANFILES += www/admin/service/index.php
EXTRA_DIST += www/admin/service/index.php.in
-www/admin/sharedfolder/index.php:
+www/admin/sharedfolder/index.php: www/admin/sharedfolder/index.php.in
@$(mkinstalldirs) www/admin/sharedfolder
$(do_subst) <$(srcdir)/www/admin/sharedfolder/index.php.in >$@
CLEANFILES += www/admin/sharedfolder/index.php
EXTRA_DIST += www/admin/sharedfolder/index.php.in
-www/admin/sharedfolder/sf.php:
+www/admin/sharedfolder/sf.php: www/admin/sharedfolder/sf.php.in
@$(mkinstalldirs) www/admin/sharedfolder
$(do_subst) <$(srcdir)/www/admin/sharedfolder/sf.php.in >$@
CLEANFILES += www/admin/sharedfolder/sf.php
EXTRA_DIST += www/admin/sharedfolder/sf.php.in
-www/admin/user/deliver.php:
+www/admin/user/deliver.php: www/admin/user/deliver.php.in
@$(mkinstalldirs) www/admin/user
$(do_subst) <$(srcdir)/www/admin/user/deliver.php.in >$@
CLEANFILES += www/admin/user/deliver.php
EXTRA_DIST += www/admin/user/deliver.php.in
-www/admin/user/forward.php:
+www/admin/user/forward.php: www/admin/user/forward.php.in
@$(mkinstalldirs) www/admin/user
$(do_subst) <$(srcdir)/www/admin/user/forward.php.in >$@
CLEANFILES += www/admin/user/forward.php
EXTRA_DIST += www/admin/user/forward.php.in
-www/admin/user/index.php:
+www/admin/user/index.php: www/admin/user/index.php.in
@$(mkinstalldirs) www/admin/user
$(do_subst) <$(srcdir)/www/admin/user/index.php.in >$@
CLEANFILES += www/admin/user/index.php
EXTRA_DIST += www/admin/user/index.php.in
-www/admin/user/vacation.php:
+www/admin/user/vacation.php: www/admin/user/vacation.php.in
@$(mkinstalldirs) www/admin/user
$(do_subst) <$(srcdir)/www/admin/user/vacation.php.in >$@
CLEANFILES += www/admin/user/vacation.php
EXTRA_DIST += www/admin/user/vacation.php.in
###
-php/admin/include/auth.class.php:
+php/admin/include/auth.class.php: php/admin/include/auth.class.php.in
@$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/auth.class.php.in >$@
CLEANFILES += php/admin/include/auth.class.php
EXTRA_DIST += php/admin/include/auth.class.php.in
-php/admin/include/config.php: Makefile php/admin/include/config.php.in
+php/admin/include/config.php: php/admin/include/config.php.in
$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/config.php.in >$@
CLEANFILES += php/admin/include/config.php
EXTRA_DIST += php/admin/include/config.php.in
-php/admin/include/headers.php:
+php/admin/include/headers.php: php/admin/include/headers.php.in
@$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/headers.php.in >$@
CLEANFILES += php/admin/include/headers.php
EXTRA_DIST += php/admin/include/headers.php.in
-php/admin/include/mysmarty.php:
+php/admin/include/mysmarty.php: php/admin/include/mysmarty.php.in
@$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/mysmarty.php.in >$@
CLEANFILES += php/admin/include/mysmarty.php
EXTRA_DIST += php/admin/include/mysmarty.php.in
-php/admin/templates/page.tpl:
+php/admin/templates/page.tpl: php/admin/templates/page.tpl.in
@$(mkinstalldirs) php/admin/templates
$(do_subst) <$(srcdir)/php/admin/templates/page.tpl.in >$@
CLEANFILES += php/admin/templates/page.tpl
EXTRA_DIST += php/admin/templates/page.tpl.in
-php/admin/templates/versions.tpl:
+php/admin/templates/versions.tpl: php/admin/templates/versions.tpl.in
@$(mkinstalldirs) php/admin/templates
if OPENPKG
sed 's/^@OPENPKG@//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
@@ -389,19 +389,19 @@
CLEANFILES += php/admin/templates/versions.tpl
EXTRA_DIST += php/admin/templates/versions.tpl.in
-www/admin/logout.php:
+www/admin/logout.php: www/admin/logout.php.in
@$(mkinstalldirs) www/admin
$(do_subst) <$(srcdir)/www/admin/logout.php.in >$@
CLEANFILES += www/admin/logout.php
EXTRA_DIST += www/admin/logout.php.in
-www/admin/user/user.php:
+www/admin/user/user.php: www/admin/user/user.php.in
@$(mkinstalldirs) www/admin/user
$(do_subst) <$(srcdir)/www/admin/user/user.php.in >$@
CLEANFILES += www/admin/user/user.php
EXTRA_DIST += www/admin/user/user.php.in
-www/admin/kolab/versions.php:
+www/admin/kolab/versions.php: www/admin/kolab/versions.php.in
@$(mkinstalldirs) www/admin/kolab
$(do_subst) <$(srcdir)/www/admin/kolab/versions.php.in >$@
CLEANFILES += www/admin/kolab/versions.php
Index: kolab-webadmin.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolab-webadmin.spec.in 20 Apr 2007 14:07:54 -0000 1.17
+++ kolab-webadmin.spec.in 21 Jun 2007 17:36:15 -0000 1.18
@@ -62,7 +62,6 @@
./configure -prefix=%{l_prefix} --with-dist=kolab
%install
- rm -rf $RPM_BUILD_ROOT
# install package
%{l_make} %{l_mflags} install \
From cvs at kolab.org Thu Jun 21 19:52:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Jun 2007 19:52:26 +0200 (CEST)
Subject: marcus: server/perl-kolab ChangeLog,1.15,1.16 Makefile.am,1.9,1.10
Message-ID: <20070621175226.98D34614446@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv29059
Modified Files:
ChangeLog Makefile.am
Log Message:
added Makefile dependencies
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog 4 Dec 2006 13:31:48 -0000 1.15
+++ ChangeLog 21 Jun 2007 17:52:24 -0000 1.16
@@ -1,3 +1,7 @@
+2007-06-21 Marcus Hüwe <suse-tux at gmx.de>
+
+ * Makefile.am: added Makefile dependencies
+
2006-12-04 Gunnar Wrobel <wrobel at pardus.de>
* Kolab-Conf/Conf.pm.in (build): Only print "No configuration
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am 3 Jan 2006 22:00:39 -0000 1.9
+++ Makefile.am 21 Jun 2007 17:52:24 -0000 1.10
@@ -36,45 +36,44 @@
LDAP_moduledir = $(backenddir)/Backend
LDAP_module_DATA = $(LDAP_module_FILES)
-EXTRA_DIST += Kolab-LDAP-Backend/Backend.pm \
- Kolab-LDAP-Backend-ad/ad.pm \
+EXTRA_DIST += Kolab-LDAP-Backend-ad/ad.pm \
Kolab-LDAP-Backend-dirservd/dirservd.pm
pkdocdir = $(pkgdocdir)/perl-kolab
dist_pkdoc_DATA = ChangeLog NEWS AUTHORS COPYING
EXTRA_DIST += INSTALL
-Kolab/Kolab.pm:
+Kolab/Kolab.pm: Kolab/Kolab.pm.in
@$(mkinstalldirs) Kolab
$(do_subst) <$(srcdir)/Kolab/Kolab.pm.in > $@
CLEANFILES += Kolab/Kolab.pm
EXTRA_DIST += Kolab/Kolab.pm.in
-Kolab-Conf/Conf.pm:
+Kolab-Conf/Conf.pm: Kolab-Conf/Conf.pm.in
@$(mkinstalldirs) Kolab-Conf
$(do_subst) <$(srcdir)/Kolab-Conf/Conf.pm.in > $@
CLEANFILES += Kolab-Conf/Conf.pm
EXTRA_DIST += Kolab-Conf/Conf.pm.in
-Kolab-DirServ/DirServ.pm:
+Kolab-DirServ/DirServ.pm: Kolab-DirServ/DirServ.pm.in
@$(mkinstalldirs) Kolab-DirServ
$(do_subst) <$(srcdir)/Kolab-DirServ/DirServ.pm.in > $@
CLEANFILES += Kolab-DirServ/DirServ.pm
EXTRA_DIST += Kolab-DirServ/DirServ.pm.in
-Kolab-LDAP/LDAP.pm:
+Kolab-LDAP/LDAP.pm: Kolab-LDAP/LDAP.pm.in
@$(mkinstalldirs) Kolab-LDAP
$(do_subst) <$(srcdir)/Kolab-LDAP/LDAP.pm.in > $@
CLEANFILES += Kolab-LDAP/LDAP.pm
EXTRA_DIST += Kolab-LDAP/LDAP.pm.in
-Kolab-LDAP-Backend-slurpd/slurpd.pm:
+Kolab-LDAP-Backend-slurpd/slurpd.pm: Kolab-LDAP-Backend-slurpd/slurpd.pm.in
@$(mkinstalldirs) Kolab-LDAP-Backend-slurpd
$(do_subst) <$(srcdir)/Kolab-LDAP-Backend-slurpd/slurpd.pm.in > $@
CLEANFILES += Kolab-LDAP-Backend-slurpd/slurpd.pm
EXTRA_DIST += Kolab-LDAP-Backend-slurpd/slurpd.pm.in
-Kolab-Mailer/Mailer.pm:
+Kolab-Mailer/Mailer.pm: Kolab-Mailer/Mailer.pm.in
@$(mkinstalldirs) Kolab-Mailer
$(do_subst) <$(srcdir)/Kolab-Mailer/Mailer.pm.in > $@
CLEANFILES += Kolab-Mailer/Mailer.pm
From cvs at kolab.org Thu Jun 21 21:29:53 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Jun 2007 21:29:53 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd kolabdcachetool.in, NONE, 1.1 ChangeLog,
1.97, 1.98 Makefile.am, 1.23, 1.24 kolabdcachetool, 1.2, NONE
Message-ID: <20070621192953.61DAD614446@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv31908
Modified Files:
ChangeLog Makefile.am
Added Files:
kolabdcachetool.in
Removed Files:
kolabdcachetool
Log Message:
* Makefile.am:
fixed kolab/issue1804 (Several files apparently missing in kolabd 2.1.0 package)
"dirservnotify", "dirservupdate" and "kolabdcachetool" are a part of a normal
kolabd installation (they will be installed to $(kolab_scriptsdir))
* kolabdcachetool.in:
autoconfiscated version of kolabdcachetool (renamed kolabdcachetool to
kolabdcachetool.in)
--- NEW FILE: kolabdcachetool.in ---
#!/kolab/bin/perl -w
use strict;
use Getopt::Long;
use DB_File;
use POSIX qw(strftime);
my $progname = `basename $0`;
chomp($progname);
sub usage
{
print "Usage: $progname CACHE FUNCTION
where CACHE is one of `mbox' or `gyard' (i.e. the cache to operate
on) and FUNCION is one of `list', `delete' or `flush' (i.e. the
function to perform on CACHE)\n";
exit(1);
1;
}
my $cache = shift || usage;
my $func = shift || usage;
my (%db, %db2, %sorted);
usage if ($func !~ /list/i && $func !~ /del/i && $func !~ /flush/i);
if ($cache =~ /mbox/i) {
dbmopen(%db, '@kolab_mailboxuiddb@', 0666)
|| die "Unable to open mail uid cache";
} elsif ($cache =~ /gyard/i) {
dbmopen(%db, '@graveyard_uidcache@', 0666)
|| die "Unable to open graveyard uid cache";
dbmopen(%db2, '@graveyard_tscache@', 0666)
|| die "Unable to open graveyard timestamp cache";
} else { usage; }
my ($guid, $ts);
foreach $guid (keys %db) {
#$sorted{
$ts = "";
$ts = ", deleted " . strftime("%F %T", localtime($db2{$guid})) if exists($db2{$guid});
print "GUID: `$guid', mailbox: `" . $db{$guid} . "'$ts\n";
}
dbmclose(%db);
dbmclose(%db2);
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- ChangeLog 21 Jun 2007 14:48:24 -0000 1.97
+++ ChangeLog 21 Jun 2007 19:29:51 -0000 1.98
@@ -5,11 +5,20 @@
fixed kolab/issue1805 (Uncleaned files in kolabd source package)
Added missing Makefile dependencies (pointed out by Peter Eisentraut)
+ fixed kolab/issue1804 (Several files apparently missing in kolabd 2.1.0 package)
+ "dirservnotify", "dirservupdate" and "kolabdcachetool" are a part of a normal
+ kolabd installation (they will be installed to $(kolab_scriptsdir))
+
* kolabd.spec.in:
removed "rm -rf $RPM_BUILD_ROOT" from the %install section as this opens
a possible race condition (see http://lists.opensuse.org/opensuse-packaging/2007-02/msg00005.html
for more information)
+
+ * kolabdcachetool.in:
+
+ autoconfiscated version of kolabdcachetool (renamed kolabdcachetool to
+ kolabdcachetool.in)
2007-05-11 Gunnar Wrobel <p at rdus.de>
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.am 21 Jun 2007 14:37:34 -0000 1.23
+++ Makefile.am 21 Jun 2007 19:29:51 -0000 1.24
@@ -26,8 +26,13 @@
workaround.sh \
kolabquotawarn \
kolab_upgrade \
- kolab_smtpdpolicy
+ kolab_smtpdpolicy \
+ dirservnotify \
+ dirservupdate \
+ kolabdcachetool
+EXTRA_DIST += dirservnotify \
+ dirservupdate
kolabconfig_FILES = kolab.conf \
kolab.globals \
@@ -231,6 +236,13 @@
chmod a+x kolabquotawarn
CLEANFILES += kolabquotawarn
EXTRA_DIST += kolabquotawarn.in
+
+kolabdcachetool: kolabdcachetool.in
+ @$(mkinstalldirs) .
+ $(do_subst) <$(srcdir)/kolabdcachetool.in >$@
+ chmod a+x kolabdcachetool
+CLEANFILES += kolabdcachetool
+EXTRA_DIST += kolabdcachetool.in
namespace/libexec/adduser: namespace/libexec/adduser.in
@$(mkinstalldirs) namespace/libexec
--- kolabdcachetool DELETED ---
From cvs at kolab.org Thu Jun 21 23:01:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Jun 2007 23:01:28 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd kolabdcachetool.in,1.1,1.2
Message-ID: <20070621210128.985FD61444C@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv2126
Modified Files:
kolabdcachetool.in
Log Message:
forgot to autoconfiscate the shebang line.
Good catch Richard!
Index: kolabdcachetool.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabdcachetool.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolabdcachetool.in 21 Jun 2007 19:29:51 -0000 1.1
+++ kolabdcachetool.in 21 Jun 2007 21:01:26 -0000 1.2
@@ -1,4 +1,4 @@
-#!/kolab/bin/perl -w
+#!@PERL@ -w
use strict;
use Getopt::Long;
From cvs at kolab.org Fri Jun 22 02:31:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 22 Jun 2007 02:31:09 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd dirservnotify.in, NONE,
1.1 dirservupdate.in, NONE, 1.1 ChangeLog, 1.98,
1.99 Makefile.am, 1.24, 1.25 dirservnotify, 1.1.1.1,
NONE dirservupdate, 1.1.1.1, NONE
Message-ID: <20070622003109.5BBFC614447@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv19318
Modified Files:
ChangeLog Makefile.am
Added Files:
dirservnotify.in dirservupdate.in
Removed Files:
dirservnotify dirservupdate
Log Message:
* Makefile.am, dirservnotify, dirservupdate:
autoconfiscated dirservnotify and dirservupdate. "dirservnotify" was renamed
to "dirservnotify.in" and "dirservupdate" was renamed to "dirservupdate.in".
--- NEW FILE: dirservnotify.in ---
#!@PERL@ -w
use strict;
use Getopt::Long;
use URI;
use Net::LDAP;
use Net::LDAP::LDIF;
use Net::LDAP::Entry;
use Kolab;
use Kolab::DirServ;
use Kolab::LDAP;
use vars qw($name $mode);
GetOptions(
"name=s" => \$name,
"mode=s" => \$mode
);
exit 0 if !defined $mode;
my $ldap;
$ldap = Kolab::LDAP::create(
$Kolab::config{'ldap_ip'},
$Kolab::config{'ldap_port'},
$Kolab::config{'bind_dn'},
$Kolab::config{'bind_pw'}
) || die;
my $mesg = $ldap->search(
base => $Kolab::config{'base_dn'},
scope => 'one',
filter => "(&(cn=*$name*)(mail=*))"
);
$mesg->code && die $mesg->error;
my $max = $mesg->count;
$max || die "Nothing to do!";
for (my $i = 0; $i < $max; $i++) {
my $entry = $mesg->entry($i);
if ($mode =~ /add/) {
Kolab::DirServ::notifyNew($entry);
}
if ($mode =~ /del/) {
Kolab::DirServ::notifyRemove($entry);
}
if ($mode =~ /upd/) {
Kolab::DirServ::notifyModify($entry);
}
}
--- NEW FILE: dirservupdate.in ---
#!@PERL@ -w
use strict;
use Getopt::Long;
use Kolab::DirServ;
use Kolab;
use Kolab::Util;
use vars qw($server $user $password);
GetOptions(
"server=s" => \$server,
"user=s" => \$user,
"password=s" => \$password
);
#easy default values for development
$server = $Kolab::config{'dirserv_mailbox_server'} if !$server;
$user = $Kolab::config{'dirserv_mailbox_user'} if !$user;
$password = $Kolab::config{'dirserv_mailbox_password'} if !$password;
Kolab::DirServ::handleNotifications($server, $user, $password);
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- ChangeLog 21 Jun 2007 19:29:51 -0000 1.98
+++ ChangeLog 22 Jun 2007 00:31:07 -0000 1.99
@@ -1,3 +1,10 @@
+2007-06-22 Marcus Hüwe <suse-tux at gmx.de>
+
+ * Makefile.am, dirservnotify, dirservupdate:
+
+ autoconfiscated dirservnotify and dirservupdate. "dirservnotify" was renamed
+ to "dirservnotify.in" and "dirservupdate" was renamed to "dirservupdate.in".
+
2007-06-21 Marcus Hüwe <suse-tux at gmx.de>
* Makefile.am:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile.am 21 Jun 2007 19:29:51 -0000 1.24
+++ Makefile.am 22 Jun 2007 00:31:07 -0000 1.25
@@ -31,8 +31,6 @@
dirservupdate \
kolabdcachetool
-EXTRA_DIST += dirservnotify \
- dirservupdate
kolabconfig_FILES = kolab.conf \
kolab.globals \
@@ -243,6 +241,20 @@
chmod a+x kolabdcachetool
CLEANFILES += kolabdcachetool
EXTRA_DIST += kolabdcachetool.in
+
+dirservnotify: dirservnotify.in
+ @$(mkinstalldirs) .
+ $(do_subst) <$(srcdir)/dirservnotify.in >$@
+ chmod a+x dirservnotify
+CLEANFILES += dirservnotify
+EXTRA_DIST += dirservnotify.in
+
+dirservupdate: dirservupdate.in
+ @$(mkinstalldirs) .
+ $(do_subst) <$(srcdir)/dirservupdate.in >$@
+ chmod a+x dirservupdate
+CLEANFILES += dirservupdate
+EXTRA_DIST += dirservupdate.in
namespace/libexec/adduser: namespace/libexec/adduser.in
@$(mkinstalldirs) namespace/libexec
--- dirservnotify DELETED ---
--- dirservupdate DELETED ---
From cvs at kolab.org Fri Jun 22 17:37:03 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 22 Jun 2007 17:37:03 +0200 (CEST)
Subject: thomas: utils/admin kolab-mailboxinfo.pl,NONE,1.1
Message-ID: <20070622153703.0DBDD61443D@lists.intevation.de>
Author: thomas
Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv13654
Added Files:
kolab-mailboxinfo.pl
Log Message:
Add script to list acls and non-cmu-annotations of all local cyrus mailboxes.
Management login information is read from Kolab server configuration.
--- NEW FILE: kolab-mailboxinfo.pl ---
#!/kolab/bin/perl
#
# Copyright 2007 by Intevation GmbH <intevation at intevation.de>
# Author(s):
# Thomas Arendsen Hein <thomas at intevation.de>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
#
#
# List acls and non-cmu-annotations of all local cyrus mailboxes.
# Management login information is read from Kolab server configuration.
#
# $Id: kolab-mailboxinfo.pl,v 1.1 2007/06/22 15:37:00 thomas Exp $
use Kolab::Cyrus;
my $cyrus = Kolab::Cyrus::create;
$cyrus || die 'Unable to login to Cyrus IMAP server\n';
my @results = $cyrus->listmailbox('*');
sort(@results);
foreach my $result (@results) {
my $mailbox = shift(@{$result});
my %rights = $cyrus->listacl(${mailbox});
foreach my $user (sort keys %rights) {
print "${mailbox}: acl $user: $rights{$user}\n";
}
my %info = $cyrus->getinfo(${mailbox});
foreach my $key (sort keys %info) {
$attrib = $key;
$attrib =~ s/^[^}]*}//;
if(not $attrib =~ /^\/vendor\/cmu\//) {
print "${mailbox}: annotation $attrib: $info{$key}\n";
}
}
}
# vim:set sw=4 ts=8 sts=4 sta et:
From cvs at kolab.org Fri Jun 22 18:33:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 22 Jun 2007 18:33:59 +0200 (CEST)
Subject: thomas: utils/admin save-mailboxinfo.sh,NONE,1.1
Message-ID: <20070622163359.E4012614446@lists.intevation.de>
Author: thomas
Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv15349
Added Files:
save-mailboxinfo.sh
Log Message:
Wrapper around kolab-mailboxinfo to be run from crontab
--- NEW FILE: save-mailboxinfo.sh ---
#!/bin/bash
# -------------------------------------------------------------------
# Copyright (C) 2006, 2007 by Intevation GmbH
# Author(s):
# Sascha Wilde <wilde at intevation.de>
# Thomas Arendsen Hein <thomas at intevation.de>
# This program is free software under the GNU GPL (>=v2)
# Read the file COPYING coming with the software for details.
# -------------------------------------------------------------------
# $Id: save-mailboxinfo.sh,v 1.1 2007/06/22 16:33:57 thomas Exp $
# Configuration can be done in /kolab/etc/imapd/skiplistsafe.conf
# Don't change anything in this script!
# -------------------------------------------------------------------
ADMIN_MAIL=root at localhost
ERROR_SENDER=postmaster@`hostname -f`
BACKUP_LIVESPAN=30
USER=kolab
SENDMAIL=/kolab/sbin/sendmail
MAILBOXINFO=/kolab/sbin/kolab-mailboxinfo.pl
BACKUP_DIR="/kolab/var/kolab-mailboxinfo"
BACKUP_FILE="${BACKUP_DIR}/`basename $BACKUP_DIR`-`date +%Y%m%d-%H%M%S`"
BACKUP_LATEST="${BACKUP_DIR}/latest"
# Change identity if necessary
if [ `whoami` != "$USER" ] ; then
if [ $UID -eq 0 ] ; then
exec su -p - $USER "$0" "$1"
else
echo >&2 "$0 must be run as $USER or root!"
exit 1
fi
fi
# Error handling functions:
report()
{
$SENDMAIL $ADMIN_MAIL \
<<EOF
From: Kolab Mailboxinfo Script <${ERROR_SENDER}>
To: Kolab Admin <${ADMIN_MAIL}>
Subject: Kolab Mailboxinfo for `hostname -f`
$0 reported:
$1
EOF
}
backup()
{
[ -d "$BACKUP_DIR" ] || { mkdir -p "$BACKUP_DIR"; touch "$BACKUP_LATEST"; }
$MAILBOXINFO > "$BACKUP_FILE"
if diff -u "$BACKUP_LATEST" "$BACKUP_FILE" >/dev/null; then
# no differences
rm "$BACKUP_FILE"
else
report "`diff -u "$BACKUP_LATEST" "$BACKUP_FILE" | grep '^[+-][^+-]'`"
cp "$BACKUP_FILE" "$BACKUP_LATEST"
gzip -9 "$BACKUP_FILE"
fi
}
expunge-old-backups()
{
find "$BACKUP_DIR" \
-type f -name "`basename $BACKUP_DIR`-*.gz" -mtime +$BACKUP_LIVESPAN \
-exec rm \{\} \;
}
# -------------------------------------------------------------------
# Main routine:
backup
expunge-old-backups
From cvs at kolab.org Fri Jun 22 18:34:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 22 Jun 2007 18:34:41 +0200 (CEST)
Subject: thomas: utils/admin save-mailboxinfo.sh,1.1,1.2
Message-ID: <20070622163441.75060614446@lists.intevation.de>
Author: thomas
Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv15400
Modified Files:
save-mailboxinfo.sh
Log Message:
Removed reference to skiplistsafe config file
Index: save-mailboxinfo.sh
===================================================================
RCS file: /kolabrepository/utils/admin/save-mailboxinfo.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- save-mailboxinfo.sh 22 Jun 2007 16:33:57 -0000 1.1
+++ save-mailboxinfo.sh 22 Jun 2007 16:34:39 -0000 1.2
@@ -10,10 +10,6 @@
# Read the file COPYING coming with the software for details.
# -------------------------------------------------------------------
# $Id$
-
-# Configuration can be done in /kolab/etc/imapd/skiplistsafe.conf
-# Don't change anything in this script!
-
# -------------------------------------------------------------------
ADMIN_MAIL=root at localhost
From cvs at kolab.org Mon Jun 25 17:48:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Jun 2007 17:48:23 +0200 (CEST)
Subject: bernhard: doc/proko2-doc doc2.sxw,1.71,1.72
Message-ID: <20070625154823.C72C4614428@lists.intevation.de>
Author: bernhard
Update of /kolabrepository/doc/proko2-doc
In directory doto:/tmp/cvs-serv17641
Modified Files:
doc2.sxw
Log Message:
Added hints that this documentation originally is for Proko2 branch (client)
and Kolab Server (2.0) and release notes should be paid attention to.
Index: doc2.sxw
===================================================================
RCS file: /kolabrepository/doc/proko2-doc/doc2.sxw,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
Binary files /tmp/cvsp25nI0 and /tmp/cvskq3tBT differ
From cvs at kolab.org Wed Jun 27 14:08:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Jun 2007 14:08:34 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd/dist_conf suse,1.57,1.58
Message-ID: <20070627120834.34F7E614442@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv17014/dist_conf
Modified Files:
suse
Log Message:
* dist_conf/suse:
The emailserver_socket is stored in $(libexecdir) and not in $(libdir). This
fixes a x86_64 issue.
Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- suse 13 Feb 2007 14:15:41 -0000 1.57
+++ suse 27 Jun 2007 12:08:32 -0000 1.58
@@ -53,7 +53,7 @@
emailscan_grp=root
emailserver_confdir=${sysconfdir}/postfix
-emailserver_socket=${libdir}/postfix/lmtp
+emailserver_socket=${libexecdir}/postfix/lmtp
emailserver_localstatedir=${localstatedir}/spool/postfix
emailserver_logfile=${localstatedir}/log/postfix.log
emailserver_usr=root
From cvs at kolab.org Wed Jun 27 14:08:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Jun 2007 14:08:34 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd ChangeLog,1.99,1.100
Message-ID: <20070627120834.32AF1614441@lists.intevation.de>
Author: marcus
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv17014
Modified Files:
ChangeLog
Log Message:
* dist_conf/suse:
The emailserver_socket is stored in $(libexecdir) and not in $(libdir). This
fixes a x86_64 issue.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- ChangeLog 22 Jun 2007 00:31:07 -0000 1.99
+++ ChangeLog 27 Jun 2007 12:08:32 -0000 1.100
@@ -1,3 +1,10 @@
+2007-06-27 Marcus Hüwe <suse-tux at gmx.de>
+
+ * dist_conf/suse:
+
+ The emailserver_socket is stored in $(libexecdir) and not in $(libdir). This
+ fixes a x86_64 issue.
+
2007-06-22 Marcus Hüwe <suse-tux at gmx.de>
* Makefile.am, dirservnotify, dirservupdate:
|