* Makefile.am: Include both, .po and .mo files, as the build process
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile.am 3 Jul 2007 14:47:45 -0000 1.41
+++ Makefile.am 3 Jul 2007 22:07:13 -0000 1.42
@@ -160,9 +160,12 @@
MSGFMT=msgfmt
-.po.mo:
+.po.mo: $<
+ @$(mkinstalldirs) $(basename $@)
$(MSGFMT) -o $@ $<
+CLEANFILES += php/admin/locale/*/LC_MESSAGES/messages.mo
+
PHP_LOCALE_DE_PO = php/admin/locale/de/LC_MESSAGES/messages.po
PHP_LOCALE_DE_MO = php/admin/locale/de/LC_MESSAGES/messages.mo
@@ -183,11 +186,17 @@
phplocaleitdir = $(localedir)/it/LC_MESSAGES
phplocaleesdir = $(localedir)/es/LC_MESSAGES
-dist_phplocalede_DATA = $(PHP_LOCALE_DE_PO) $(PHP_LOCALE_DE_MO)
-dist_phplocalefr_DATA = $(PHP_LOCALE_FR_PO) $(PHP_LOCALE_FR_MO)
-dist_phplocalenl_DATA = $(PHP_LOCALE_NL_PO) $(PHP_LOCALE_NL_MO)
-dist_phplocaleit_DATA = $(PHP_LOCALE_IT_PO) $(PHP_LOCALE_IT_MO)
-dist_phplocalees_DATA = $(PHP_LOCALE_ES_PO) $(PHP_LOCALE_ES_MO)
+phplocalede_DATA = $(PHP_LOCALE_DE_MO)
+phplocalefr_DATA = $(PHP_LOCALE_FR_MO)
+phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
+phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
+phplocalees_DATA = $(PHP_LOCALE_ES_MO)
+
+EXTRA_DIST += $(PHP_LOCALE_DE_PO) \
+ $(PHP_LOCALE_FR_PO) \
+ $(PHP_LOCALE_NL_PO) \
+ $(PHP_LOCALE_IT_PO) \
+ $(PHP_LOCALE_ES_PO)
kwadocdir = $(pkgdocdir)/@PACKAGE@
dist_kwadoc_DATA = ChangeLog \
From cvs at kolab.org Tue Jul 10 17:39:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Jul 2007 17:39:50 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.126,1.127
Message-ID: <20070710153950.90A1760C4CC@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv19072
Modified Files:
release-notes.txt
Log Message:
fixed kolab/issue1845 (incorrect check mailForDn for ldap results)
https://intevation.de/roundup/kolab/issue1845
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- release-notes.txt 3 Jul 2007 15:53:48 -0000 1.126
+++ release-notes.txt 10 Jul 2007 15:39:48 -0000 1.127
@@ -75,7 +75,7 @@
kolab/issue1744 (No "User Deleted, awaiting cleanup" for admins and domain maintainers)
kolab/issue1781 (Spanish PO File Translation)
kolab/issue1797 (kolab-webadmin source package missing PO files)
-
+ kolab/issue1845 (incorrect check mailForDn for ldap results)
Changes between 2.1-rc-2 and 2.1.0:
From cvs at kolab.org Tue Jul 10 17:39:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Jul 2007 17:39:50 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.49,1.50
Message-ID: <20070710153950.92D9760C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv19072/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
fixed kolab/issue1845 (incorrect check mailForDn for ldap results)
https://intevation.de/roundup/kolab/issue1845
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ChangeLog 3 Jul 2007 22:07:13 -0000 1.49
+++ ChangeLog 10 Jul 2007 15:39:48 -0000 1.50
@@ -1,3 +1,10 @@
+2007-07-10 Gunnar Wrobel
+
+ * php/admin/include/ldap.class.php:
+
+ fixed kolab/issue1845 (incorrect check mailForDn for ldap results)
+ https://intevation.de/roundup/kolab/issue1845
+
2007-07-04 Marcus Hüwe
* Makefile.am:
From cvs at kolab.org Tue Jul 10 17:39:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Jul 2007 17:39:50 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include
ldap.class.php, 1.28, 1.29
Message-ID: <20070710153950.943DA60C4CE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv19072/kolab-webadmin/kolab-webadmin/php/admin/include
Modified Files:
ldap.class.php
Log Message:
fixed kolab/issue1845 (incorrect check mailForDn for ldap results)
https://intevation.de/roundup/kolab/issue1845
Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ldap.class.php 13 Oct 2005 01:50:00 -0000 1.28
+++ ldap.class.php 10 Jul 2007 15:39:48 -0000 1.29
@@ -208,7 +208,7 @@
if( $res ) {
$entries = ldap_get_entries( $this->connection, $res );
ldap_free_result( $res );
- if( $entries['count'] == 1 ) {
+ if( $entries[0]['count'] == 1 ) {
return $entries[0]['mail'][0];
} else {
$errors[] = sprintf( _("No such object %s"), $dn);
From cvs at kolab.org Tue Jul 10 18:56:18 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Jul 2007 18:56:18 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.50,1.51
Message-ID: <20070710165618.571A760C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv21529/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
* www/admin/user/user.php.in:
fixed kolab/issue1162 (Misplaced title field in webinterface)
https://intevation.de/roundup/kolab/issue1162
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- ChangeLog 10 Jul 2007 15:39:48 -0000 1.50
+++ ChangeLog 10 Jul 2007 16:56:15 -0000 1.51
@@ -1,5 +1,10 @@
2007-07-10 Gunnar Wrobel
+ * www/admin/user/user.php.in:
+
+ fixed kolab/issue1162 (Misplaced title field in webinterface)
+ https://intevation.de/roundup/kolab/issue1162
+
* php/admin/include/ldap.class.php:
fixed kolab/issue1845 (incorrect check mailForDn for ldap results)
From cvs at kolab.org Tue Jul 10 18:56:18 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Jul 2007 18:56:18 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.127,1.128
Message-ID: <20070710165618.50D0060C4CC@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv21529
Modified Files:
release-notes.txt
Log Message:
* www/admin/user/user.php.in:
fixed kolab/issue1162 (Misplaced title field in webinterface)
https://intevation.de/roundup/kolab/issue1162
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- release-notes.txt 10 Jul 2007 15:39:48 -0000 1.127
+++ release-notes.txt 10 Jul 2007 16:56:15 -0000 1.128
@@ -66,6 +66,7 @@
Added missing Makefile dependencies
+ kolab/issue1162 (Misplaced title field in webinterface)
kolab/issue1610 (Use for forms in webadmin)
kolab/issue1615 (Use also for login page)
kolab/issue1618 (Add missing headings)
From cvs at kolab.org Tue Jul 10 18:56:18 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 10 Jul 2007 18:56:18 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
user.php.in, 1.20, 1.21
Message-ID: <20070710165618.58B2260C4CE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv21529/kolab-webadmin/kolab-webadmin/www/admin/user
Modified Files:
user.php.in
Log Message:
* www/admin/user/user.php.in:
fixed kolab/issue1162 (Misplaced title field in webinterface)
https://intevation.de/roundup/kolab/issue1162
Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- user.php.in 2 Jul 2007 22:33:47 -0000 1.20
+++ user.php.in 10 Jul 2007 16:56:15 -0000 1.21
@@ -484,8 +484,7 @@
'policies' => array('anyone' => 4),
'validation' => 'checkpolicy',
'comment' => _('For automatic invitation handling') . ' ' .
- _("NOTE: For regular accounts to use this feature, give the 'calendar' user access to the Calendar folder") ),
- 'title_0' => array( 'name' => _('Title') ) );
+ _("NOTE: For regular accounts to use this feature, give the 'calendar' user access to the Calendar folder") ));
$entries['alias'] = array( 'name' => _('Email Aliases'),
'type' => 'textarea',
@@ -504,6 +503,7 @@
'comment' => _('restrict allowed recipients of SMTP messages') . ' ' .
_('One entry per line.') );
+$entries['title_0'] = array( 'name' => _('Title') );
$entries['o_0'] = array( 'name' => _('Organisation') );
$entries['ou_0'] = array( 'name' => _('Organisational Unit') );
$entries['roomNumber_0'] = array( 'name' => _('Room Number') );
From cvs at kolab.org Wed Jul 11 16:21:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:21:00 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
sf.php.in, 1.7, 1.8
Message-ID: <20070711142100.5A5A160C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
In directory doto:/tmp/cvs-serv20654/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
Modified Files:
sf.php.in
Log Message:
* www/admin/sharedfolder/sf.php.in:
fixed kolab/issue1694 (Unable to modify the folder type of an already created shared folder)
https://intevation.de/roundup/kolab/issue1694
Index: sf.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sf.php.in 16 Mar 2007 12:17:24 -0000 1.7
+++ sf.php.in 11 Jul 2007 14:20:58 -0000 1.8
@@ -47,6 +47,7 @@
else
$form->entries['foldertype']['value'] = '';
} else $form->entries['foldertype']['value'] = '';
+ $form->entries['foldertype']['attrs'] = 'readonly';
$form->entries['action']['value'] = 'save';
//debug("got userquota=$userquota cn=$cn ");
$aclcount = 0;
From cvs at kolab.org Wed Jul 11 16:21:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:21:00 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.128,1.129
Message-ID: <20070711142100.666C760C4CC@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv20654
Modified Files:
release-notes.txt
Log Message:
* www/admin/sharedfolder/sf.php.in:
fixed kolab/issue1694 (Unable to modify the folder type of an already created shared folder)
https://intevation.de/roundup/kolab/issue1694
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- release-notes.txt 10 Jul 2007 16:56:15 -0000 1.128
+++ release-notes.txt 11 Jul 2007 14:20:58 -0000 1.129
@@ -72,6 +72,7 @@
kolab/issue1618 (Add missing headings)
kolab/issue1619 (Add CSS file for printing)
kolab/issue1620 (fix invalid XHTML in form.class.php)
+ kolab/issue1694 (Unable to modify the folder type of an already created shared folder)
kolab/issue1742 (Do not modify the objectclasses of an existing object)
kolab/issue1744 (No "User Deleted, awaiting cleanup" for admins and domain maintainers)
kolab/issue1781 (Spanish PO File Translation)
From cvs at kolab.org Wed Jul 11 16:21:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:21:00 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.51,1.52
Message-ID: <20070711142100.5BC1360C4C7@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv20654/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
* www/admin/sharedfolder/sf.php.in:
fixed kolab/issue1694 (Unable to modify the folder type of an already created shared folder)
https://intevation.de/roundup/kolab/issue1694
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- ChangeLog 10 Jul 2007 16:56:15 -0000 1.51
+++ ChangeLog 11 Jul 2007 14:20:58 -0000 1.52
@@ -1,3 +1,10 @@
+2007-07-11 Gunnar Wrobel
+
+ * www/admin/sharedfolder/sf.php.in:
+
+ fixed kolab/issue1694 (Unable to modify the folder type of an already created shared folder)
+ https://intevation.de/roundup/kolab/issue1694
+
2007-07-10 Gunnar Wrobel
* www/admin/user/user.php.in:
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server Makefile,1.18,1.19
Message-ID: <20070711143809.09C6A60C4C7@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv21117
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile 30 May 2007 06:17:24 -0000 1.18
+++ Makefile 11 Jul 2007 14:38:06 -0000 1.19
@@ -8,13 +8,13 @@
openldap \
imapd \
postfix \
- perl-kolab \
- kolabd \
- kolab-horde-fbview \
- kolab-horde-framework \
- kolab-resource-handlers \
- php-smarty \
- kolab-webadmin \
+ php-smarty
+
+KOLAB_PACKAGES=kolabd \
+ kolab-horde-fbview \
+ kolab-horde-framework \
+ kolab-resource-handlers \
+ kolab-webadmin \
BASE_FILES=obmtool \
obmtool.conf \
@@ -28,29 +28,33 @@
do \
cd $$PKG && make dist;cd ..;\
done
+ cd perl-kolab && make -f Makefile.cvs dist
+ for PKG in $(KOLAB_PACKAGES); \
+ do \
+ cd $$PKG && make dist;cd ..;\
+ 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
+HORDE_PACKAGES=pear/PEAR-PEAR \
+ pear/PEAR-Archive_Tar \
+ pear/PEAR-Auth_SASL \
+ pear/PEAR-Console_Getopt \
+ pear/PEAR-Date \
+ pear/PEAR-Log \
+ pear/PEAR-Mail \
+ pear/PEAR-Mail_Mime \
+ pear/PEAR-Net_Sieve \
+ pear/PEAR-Net_Socket \
+ horde/horde-framework \
+ horde/horde-passwd \
+ horde/horde \
+ horde/horde-ingo \
+ horde/horde-imp \
+ horde/horde-kronolith \
+ horde/horde-mnemo \
+ horde/horde-nag \
+ horde/horde-turba
.PHONY: dist-horde
dist-horde:
@@ -58,7 +62,7 @@
mkdir -p stage
for PKG in $(HORDE_PACKAGES); \
do \
- cd $$PKG && make dist;cd ..; \
+ 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 Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith Makefile,1.1,1.2
Message-ID: <20070711143809.3595360C4D4@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv21117/horde/horde-kronolith
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 25 May 2007 12:45:20 -0000 1.1
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.2
@@ -52,7 +52,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework Makefile,1.3,1.4
Message-ID: <20070711143809.112A260C4CF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv21117/horde/horde-framework
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 25 May 2007 10:22:28 -0000 1.3
+++ Makefile 11 Jul 2007 14:38:06 -0000 1.4
@@ -52,7 +52,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-PEAR Makefile,1.2,1.3
Message-ID: <20070711143809.4F3A560C4D3@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-PEAR
In directory doto:/tmp/cvs-serv21117/pear/PEAR-PEAR
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-PEAR/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 24 May 2007 14:42:32 -0000 1.2
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.3
@@ -20,7 +20,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/horde/horde Makefile,1.9,1.10
Message-ID: <20070711143809.0D4E860C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv21117/horde/horde
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile 25 May 2007 10:21:44 -0000 1.9
+++ Makefile 11 Jul 2007 14:38:06 -0000 1.10
@@ -52,7 +52,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Archive_Tar Makefile,1.2,1.3
Message-ID: <20070711143809.2E2E160C4C7@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv21117/pear/PEAR-Archive_Tar
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Archive_Tar/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 24 May 2007 14:42:32 -0000 1.2
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.3
@@ -20,7 +20,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo Makefile,1.1,1.2
Message-ID: <20070711143809.1AA5660C4D1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv21117/horde/horde-ingo
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 25 May 2007 13:06:44 -0000 1.1
+++ Makefile 11 Jul 2007 14:38:06 -0000 1.2
@@ -52,7 +52,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Date Makefile,1.2,1.3
Message-ID: <20070711143809.52D8360C4D2@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Date
In directory doto:/tmp/cvs-serv21117/pear/PEAR-Date
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 24 May 2007 14:42:32 -0000 1.2
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.3
@@ -21,7 +21,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag Makefile,1.1,1.2
Message-ID: <20070711143809.3CCF560C4D6@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv21117/horde/horde-nag
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 25 May 2007 13:10:05 -0000 1.1
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.2
@@ -52,7 +52,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Log Makefile,1.2,1.3
Message-ID: <20070711143809.691EE60C4D1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv21117/pear/PEAR-Log
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 24 May 2007 14:42:32 -0000 1.2
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.3
@@ -20,7 +20,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd Makefile,1.1,1.2
Message-ID: <20070711143809.24ADC60C4D2@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv21117/horde/horde-passwd
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 25 May 2007 12:59:14 -0000 1.1
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.2
@@ -52,7 +52,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail Makefile,1.2,1.3
Message-ID: <20070711143809.54B9960C4D8@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail
In directory doto:/tmp/cvs-serv21117/pear/PEAR-Mail
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 24 May 2007 14:42:32 -0000 1.2
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.3
@@ -20,7 +20,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba Makefile,1.1,1.2
Message-ID: <20070711143809.289AD60C4D3@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv21117/horde/horde-turba
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 25 May 2007 12:07:17 -0000 1.1
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.2
@@ -52,7 +52,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Socket Makefile,1.2,1.3
Message-ID: <20070711143809.49F6F60C4D7@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv21117/pear/PEAR-Net_Socket
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 24 May 2007 14:42:32 -0000 1.2
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.3
@@ -21,7 +21,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Auth_SASL Makefile,1.2,1.3
Message-ID: <20070711143809.32C3360C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv21117/pear/PEAR-Auth_SASL
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 24 May 2007 14:42:32 -0000 1.2
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.3
@@ -21,7 +21,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail_Mime Makefile,1.2,1.3
Message-ID: <20070711143809.4376460C4D0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv21117/pear/PEAR-Mail_Mime
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail_Mime/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 24 May 2007 14:42:32 -0000 1.2
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.3
@@ -21,7 +21,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp Makefile,1.1,1.2
Message-ID: <20070711143809.1669A60C4D0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv21117/horde/horde-imp
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 25 May 2007 10:55:37 -0000 1.1
+++ Makefile 11 Jul 2007 14:38:06 -0000 1.2
@@ -52,7 +52,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo Makefile,1.1,1.2
Message-ID: <20070711143809.676F060C4C7@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv21117/horde/horde-mnemo
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 25 May 2007 12:51:22 -0000 1.1
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.2
@@ -52,7 +52,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Console_Getopt Makefile,1.2,1.3
Message-ID: <20070711143809.3999760C4D5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv21117/pear/PEAR-Console_Getopt
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Console_Getopt/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 24 May 2007 14:42:32 -0000 1.2
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.3
@@ -20,7 +20,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Wed Jul 11 16:38:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 11 Jul 2007 16:38:09 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Sieve Makefile,1.2,1.3
Message-ID: <20070711143809.4693360C4CF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv21117/pear/PEAR-Net_Sieve
Modified Files:
Makefile
Log Message:
Makefile fixes for the new horde and pear structure. In addition fixed building perl-kolab.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Sieve/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 24 May 2007 14:42:32 -0000 1.2
+++ Makefile 11 Jul 2007 14:38:07 -0000 1.3
@@ -21,7 +21,7 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+ cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
From cvs at kolab.org Thu Jul 12 07:17:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 07:17:33 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
domainmaintainer.php.in, 1.11, 1.12
Message-ID: <20070712051733.6EC5360C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
In directory doto:/tmp/cvs-serv11635/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
Modified Files:
domainmaintainer.php.in
Log Message:
* www/admin/domainmaintainer/domainmaintainer.php.in:
* www/admin/sharedfolder/sf.php.in:
* www/admin/addressbook/addr.php.in:
* www/admin/user/user.php.in:
fixed kolab/issue932 (Illegal values in webadmin cause LDAP errors)
https://intevation.de/roundup/kolab/issue932
Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- domainmaintainer.php.in 29 May 2007 15:07:06 -0000 1.11
+++ domainmaintainer.php.in 12 Jul 2007 05:17:31 -0000 1.12
@@ -46,6 +46,7 @@
// Check that a uid is unique
function checkuniquemail( $form, $key, $value ) {
debug("checkuniquemail( $form, $key, $value )");
+ if( $value == '' ) return _('Please enter an uid value');
if( is_unique( 'uid', $value ) ) {
return '';
} else {
From cvs at kolab.org Thu Jul 12 07:17:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 07:17:33 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.129,1.130
Message-ID: <20070712051733.7B24760C4C5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv11635
Modified Files:
release-notes.txt
Log Message:
* www/admin/domainmaintainer/domainmaintainer.php.in:
* www/admin/sharedfolder/sf.php.in:
* www/admin/addressbook/addr.php.in:
* www/admin/user/user.php.in:
fixed kolab/issue932 (Illegal values in webadmin cause LDAP errors)
https://intevation.de/roundup/kolab/issue932
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- release-notes.txt 11 Jul 2007 14:20:58 -0000 1.129
+++ release-notes.txt 12 Jul 2007 05:17:31 -0000 1.130
@@ -66,6 +66,7 @@
Added missing Makefile dependencies
+ kolab/issue932 (Illegal values in webadmin cause LDAP errors)
kolab/issue1162 (Misplaced title field in webinterface)
kolab/issue1610 (Use for forms in webadmin)
kolab/issue1615 (Use also for login page)
From cvs at kolab.org Thu Jul 12 07:17:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 07:17:33 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.52,1.53
Message-ID: <20070712051733.7747560C4C2@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv11635/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
* www/admin/domainmaintainer/domainmaintainer.php.in:
* www/admin/sharedfolder/sf.php.in:
* www/admin/addressbook/addr.php.in:
* www/admin/user/user.php.in:
fixed kolab/issue932 (Illegal values in webadmin cause LDAP errors)
https://intevation.de/roundup/kolab/issue932
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ChangeLog 11 Jul 2007 14:20:58 -0000 1.52
+++ ChangeLog 12 Jul 2007 05:17:31 -0000 1.53
@@ -1,3 +1,13 @@
+2007-07-12 Gunnar Wrobel
+
+ * www/admin/domainmaintainer/domainmaintainer.php.in:
+ * www/admin/sharedfolder/sf.php.in:
+ * www/admin/addressbook/addr.php.in:
+ * www/admin/user/user.php.in:
+
+ fixed kolab/issue932 (Illegal values in webadmin cause LDAP errors)
+ https://intevation.de/roundup/kolab/issue932
+
2007-07-11 Gunnar Wrobel
* www/admin/sharedfolder/sf.php.in:
From cvs at kolab.org Thu Jul 12 07:17:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 07:17:33 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
user.php.in, 1.21, 1.22
Message-ID: <20070712051733.7F61060C4C8@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv11635/kolab-webadmin/kolab-webadmin/www/admin/user
Modified Files:
user.php.in
Log Message:
* www/admin/domainmaintainer/domainmaintainer.php.in:
* www/admin/sharedfolder/sf.php.in:
* www/admin/addressbook/addr.php.in:
* www/admin/user/user.php.in:
fixed kolab/issue932 (Illegal values in webadmin cause LDAP errors)
https://intevation.de/roundup/kolab/issue932
Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- user.php.in 10 Jul 2007 16:56:15 -0000 1.21
+++ user.php.in 12 Jul 2007 05:17:31 -0000 1.22
@@ -228,6 +228,24 @@
if( empty($value) ) return ''; // OK
else if( $value >= 4096 ) return _('Quota must be smaller than 4096');
else if( $value < 0 ) return _('Quota can not be negative');
+ else if( !is_numeric($value) ) return _('Quota must be a number');
+ else if( (int) $value != $value ) return _('Quota must be an integer');
+ else return '';
+}
+
+function checkfreebusyfuture( $form, $key, $value )
+{
+ if( empty($value) ) return ''; // OK
+ else if( $value < 0 ) return _('Free/Busy future can not be negative');
+ else if( !is_numeric($value) ) return _('Free/Busy future must be a number');
+ else if( (int) $value != $value ) return _('Free/Busy future must be an integer');
+ else return '';
+}
+
+function checkphone( $form, $key, $value )
+{
+ if( empty($value) ) return ''; // OK
+ else if( !preg_match('/^[a-zA-Z0-9()-+\/.=?:]*$/',$value) ) return _('Phone entries may only contain a-z, numbers and the characters ()-+/.=?:');
else return '';
}
@@ -512,8 +530,10 @@
$entries['postalCode_0'] = array( 'name' => _('Postal Code') );
$entries['l_0'] = array( 'name' => _('City') );
$entries['c_0'] = array( 'name' => _('Country') );
-$entries['telephoneNumber_0'] = array( 'name' => _('Telephone Number') );
-$entries['facsimileTelephoneNumber_0'] = array( 'name' => _('Fax Number') );
+$entries['telephoneNumber_0'] = array( 'name' => _('Telephone Number'),
+ 'validation' => 'checkphone' );
+$entries['facsimileTelephoneNumber_0'] = array( 'name' => _('Fax Number'),
+ 'validation' => 'checkphone' );
if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer' ) {
$entries['cyrus-userquota'] = array( 'name' => _('User Quota in MBytes'),
'comment' => _('Leave blank for unlimited'),
@@ -529,7 +549,8 @@
$entries['uid']['attrs'] = 'readonly';
}
$entries['kolabFreeBusyFuture_0'] = array( 'name' => _('Free/Busy interval in days'),
- 'comment' => _('Leave blank for default (60 days)') );
+ 'comment' => _('Leave blank for default (60 days)'),
+ 'validation' => 'checkfreebusyfuture' );
$entries['action'] = array( 'name' => 'action',
'type' => 'hidden' );
From cvs at kolab.org Thu Jul 12 07:17:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 07:17:33 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
addr.php.in, 1.6, 1.7
Message-ID: <20070712051733.7362B60C4C0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
In directory doto:/tmp/cvs-serv11635/kolab-webadmin/kolab-webadmin/www/admin/addressbook
Modified Files:
addr.php.in
Log Message:
* www/admin/domainmaintainer/domainmaintainer.php.in:
* www/admin/sharedfolder/sf.php.in:
* www/admin/addressbook/addr.php.in:
* www/admin/user/user.php.in:
fixed kolab/issue932 (Illegal values in webadmin cause LDAP errors)
https://intevation.de/roundup/kolab/issue932
Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- addr.php.in 24 May 2007 09:31:05 -0000 1.6
+++ addr.php.in 12 Jul 2007 05:17:31 -0000 1.7
@@ -91,6 +91,13 @@
return $str;
}
+function checkphone( $form, $key, $value )
+{
+ if( empty($value) ) return ''; // OK
+ else if( !preg_match('/^[a-zA-Z0-9()-+\/.=?:]*$/',$value) ) return _('Phone entries may only contain a-z, numbers and the characters ()-+/.=?:');
+ else return '';
+}
+
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
$heading = '';
@@ -129,8 +136,10 @@
'postalCode' => array( 'name' => _('Postal Code') ),
'l' => array( 'name' => _('City') ),
'c' => array( 'name' => _('Country') ),
- 'telephoneNumber' => array( 'name' => _('Telephone Number') ),
- 'facsimileTelephoneNumber' => array( 'name' => _('Fax Number') ));
+ 'telephoneNumber' => array( 'name' => _('Telephone Number'),
+ 'validation' => 'checkphone' ),
+ 'facsimileTelephoneNumber' => array( 'name' => _('Fax Number'),
+ 'validation' => 'checkphone' ));
$entries['action'] = array( 'name' => 'action',
'type' => 'hidden' );
From cvs at kolab.org Thu Jul 12 07:17:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 07:17:33 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
sf.php.in, 1.8, 1.9
Message-ID: <20070712051733.7BF9660C4C7@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
In directory doto:/tmp/cvs-serv11635/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
Modified Files:
sf.php.in
Log Message:
* www/admin/domainmaintainer/domainmaintainer.php.in:
* www/admin/sharedfolder/sf.php.in:
* www/admin/addressbook/addr.php.in:
* www/admin/user/user.php.in:
fixed kolab/issue932 (Illegal values in webadmin cause LDAP errors)
https://intevation.de/roundup/kolab/issue932
Index: sf.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sf.php.in 11 Jul 2007 14:20:58 -0000 1.8
+++ sf.php.in 12 Jul 2007 05:17:31 -0000 1.9
@@ -25,6 +25,18 @@
array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
+// Due to a cyrus imapd bug we can't currently
+// support quotas over 4095 MB, see issue1262
+function checkquota( $form, $key, $value )
+{
+ if( empty($value) ) return ''; // OK
+ else if( $value >= 4096 ) return _('Quota must be smaller than 4096');
+ else if( $value < 0 ) return _('Quota can not be negative');
+ else if( !is_numeric($value) ) return _('Quota must be a number');
+ else if( (int) $value != $value ) return _('Quota must be an integer');
+ else return '';
+}
+
require_once('@kolab_php_module_prefix at admin/include/menu.php');
function fill_form_for_modify( &$form, &$ldap_object ) {
@@ -130,7 +142,8 @@
'value' => '' ),
'cyrus-userquota' => array( 'name' => _('Quota Limit'),
- 'comment' => _('MBytes (empty for unlimited)') ),
+ 'comment' => _('MBytes (empty for unlimited)'),
+ 'validation' => 'checkquota' ),
'acl_0' => array( 'name' => _('Permission for UID/GID'),
'type' => 'aclselect',
'user' => 'anyone',
From cvs at kolab.org Thu Jul 12 16:06:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 16:06:57 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.130,1.131
Message-ID: <20070712140657.1181460C4C8@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv29861
Modified Files:
release-notes.txt
Log Message:
This line was intentionally left blank
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- release-notes.txt 12 Jul 2007 05:17:31 -0000 1.130
+++ release-notes.txt 12 Jul 2007 14:06:54 -0000 1.131
@@ -80,6 +80,7 @@
kolab/issue1797 (kolab-webadmin source package missing PO files)
kolab/issue1845 (incorrect check mailForDn for ldap results)
+
Changes between 2.1-rc-2 and 2.1.0:
- Documentation
From cvs at kolab.org Thu Jul 12 16:19:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 16:19:34 +0200 (CEST)
Subject: thomas: server/doc/administration frontend.sgml,1.4,1.5
Message-ID: <20070712141934.2006E60C4C8@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/doc/administration
In directory doto:/tmp/cvs-serv30214/doc/administration
Modified Files:
frontend.sgml
Log Message:
"user" and "uid" are spoken with an initial "j", so use "a" instead of "an".
Index: frontend.sgml
===================================================================
RCS file: /kolabrepository/server/doc/administration/frontend.sgml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- frontend.sgml 18 Jun 2004 13:25:44 -0000 1.4
+++ frontend.sgml 12 Jul 2007 14:19:32 -0000 1.5
@@ -69,7 +69,7 @@
User form
-Start page of the web interface as an user authenticated:
+Start page of the web interface as a user authenticated:
@@ -298,7 +298,7 @@
possible from within the menues Administrator or Maintainer. Accounts
within the groups can be created or removed. As those accounts do not possess
own E-Mail addresses only few information is needed to specify an account. These
-credentials are first and last name, a password an an uid.
+credentials are first and last name, a password and a uid.
From cvs at kolab.org Thu Jul 12 16:19:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 16:19:34 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
domainmaintainer.php.in, 1.12, 1.13
Message-ID: <20070712141934.20E5560C4CA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
In directory doto:/tmp/cvs-serv30214/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
Modified Files:
domainmaintainer.php.in
Log Message:
"user" and "uid" are spoken with an initial "j", so use "a" instead of "an".
Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- domainmaintainer.php.in 12 Jul 2007 05:17:31 -0000 1.12
+++ domainmaintainer.php.in 12 Jul 2007 14:19:32 -0000 1.13
@@ -46,7 +46,7 @@
// Check that a uid is unique
function checkuniquemail( $form, $key, $value ) {
debug("checkuniquemail( $form, $key, $value )");
- if( $value == '' ) return _('Please enter an uid value');
+ if( $value == '' ) return _('Please enter a uid value');
if( is_unique( 'uid', $value ) ) {
return '';
} else {
From cvs at kolab.org Thu Jul 12 18:28:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 18:28:26 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
user.php.in, 1.22, 1.23
Message-ID: <20070712162826.17E2960C4D2@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv1206/kolab-webadmin/www/admin/user
Modified Files:
user.php.in
Log Message:
Remove code duplications.
Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- user.php.in 12 Jul 2007 05:17:31 -0000 1.22
+++ user.php.in 12 Jul 2007 16:28:23 -0000 1.23
@@ -117,23 +117,6 @@
}
}
-function checkuniquealias( $form, $key, $value ) {
- global $ldap;
- global $action;
- global $dn;
- $excludedn = false;
- if( $action == 'save' ) $excludedn = trim($dn);
- $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
- $str = '';
- 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)._(' collides with an address already used for another user, a vCard or a distribution list. ');
- }
- }
- return $str;
-}
-
function checkuid( $form, $key, $value ) {
global $ldap;
global $action;
@@ -221,31 +204,12 @@
return '';
}
-// Due to a cyrus imapd bug we can't currently
-// support quotas over 4095 MB, see issue1262
-function checkquota( $form, $key, $value )
-{
- if( empty($value) ) return ''; // OK
- else if( $value >= 4096 ) return _('Quota must be smaller than 4096');
- else if( $value < 0 ) return _('Quota can not be negative');
- else if( !is_numeric($value) ) return _('Quota must be a number');
- else if( (int) $value != $value ) return _('Quota must be an integer');
- else return '';
-}
-
function checkfreebusyfuture( $form, $key, $value )
{
if( empty($value) ) return ''; // OK
else if( $value < 0 ) return _('Free/Busy future can not be negative');
else if( !is_numeric($value) ) return _('Free/Busy future must be a number');
else if( (int) $value != $value ) return _('Free/Busy future must be an integer');
- else return '';
-}
-
-function checkphone( $form, $key, $value )
-{
- if( empty($value) ) return ''; // OK
- else if( !preg_match('/^[a-zA-Z0-9()-+\/.=?:]*$/',$value) ) return _('Phone entries may only contain a-z, numbers and the characters ()-+/.=?:');
else return '';
}
From cvs at kolab.org Thu Jul 12 18:28:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 18:28:26 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
addr.php.in, 1.7, 1.8
Message-ID: <20070712162826.14F6B60C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
In directory doto:/tmp/cvs-serv1206/kolab-webadmin/www/admin/addressbook
Modified Files:
addr.php.in
Log Message:
Remove code duplications.
Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- addr.php.in 12 Jul 2007 05:17:31 -0000 1.7
+++ addr.php.in 12 Jul 2007 16:28:23 -0000 1.8
@@ -74,30 +74,6 @@
}
}
-function checkuniquealias( $form, $key, $value ) {
- global $ldap;
- global $action;
- global $dn;
- $excludedn = false;
- if( $action == 'save' ) $excludedn = trim($dn);
- $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
- $str = '';
- 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)._(' collides with an address already used for another user, a vCard or a distribution list. ');
- }
- }
- return $str;
-}
-
-function checkphone( $form, $key, $value )
-{
- if( empty($value) ) return ''; // OK
- else if( !preg_match('/^[a-zA-Z0-9()-+\/.=?:]*$/',$value) ) return _('Phone entries may only contain a-z, numbers and the characters ()-+/.=?:');
- else return '';
-}
-
/**** Submenu for current page ***/
$menuitems[$sidx]['selected'] = 'selected';
$heading = '';
From cvs at kolab.org Thu Jul 12 18:28:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 18:28:26 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
sf.php.in, 1.9, 1.10
Message-ID: <20070712162826.15DE560C4CF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
In directory doto:/tmp/cvs-serv1206/kolab-webadmin/www/admin/sharedfolder
Modified Files:
sf.php.in
Log Message:
Remove code duplications.
Index: sf.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sf.php.in 12 Jul 2007 05:17:31 -0000 1.9
+++ sf.php.in 12 Jul 2007 16:28:23 -0000 1.10
@@ -25,18 +25,6 @@
array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
-// Due to a cyrus imapd bug we can't currently
-// support quotas over 4095 MB, see issue1262
-function checkquota( $form, $key, $value )
-{
- if( empty($value) ) return ''; // OK
- else if( $value >= 4096 ) return _('Quota must be smaller than 4096');
- else if( $value < 0 ) return _('Quota can not be negative');
- else if( !is_numeric($value) ) return _('Quota must be a number');
- else if( (int) $value != $value ) return _('Quota must be an integer');
- else return '';
-}
-
require_once('@kolab_php_module_prefix at admin/include/menu.php');
function fill_form_for_modify( &$form, &$ldap_object ) {
From cvs at kolab.org Thu Jul 12 18:28:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 18:28:26 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include
form.class.php, 1.31, 1.32
Message-ID: <20070712162826.16DDB60C4D1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv1206/kolab-webadmin/php/admin/include
Modified Files:
form.class.php
Log Message:
Remove code duplications.
Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- form.class.php 24 May 2007 10:17:24 -0000 1.31
+++ form.class.php 12 Jul 2007 16:28:23 -0000 1.32
@@ -20,6 +20,42 @@
require_once('mysmarty.php');
+function checkuniquealias( $form, $key, $value ) {
+ global $ldap;
+ global $action;
+ global $dn;
+ $excludedn = false;
+ if( $action == 'save' ) $excludedn = trim($dn);
+ $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
+ $str = '';
+ 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)._(' collides with an address already used for another user, a vCard or a distribution list. ');
+ }
+ }
+ return $str;
+}
+
+// Due to a cyrus imapd bug we can't currently
+// support quotas over 4095 MB, see issue1262
+function checkquota( $form, $key, $value )
+{
+ if( empty($value) ) return ''; // OK
+ else if( $value >= 4096 ) return _('Quota must be smaller than 4096');
+ else if( $value < 0 ) return _('Quota can not be negative');
+ else if( !is_numeric($value) ) return _('Quota must be a number');
+ else if( (int) $value != $value ) return _('Quota must be an integer');
+ else return '';
+}
+
+function checkphone( $form, $key, $value )
+{
+ if( empty($value) ) return ''; // OK
+ else if( !preg_match('/^[a-zA-Z0-9()-+\/.=?:]*$/',$value) ) return _('Phone entries may only contain a-z, numbers and the characters ()-+/.=?:');
+ else return '';
+}
+
class KolabForm {
/*
* $entries should be an array of the form:
From cvs at kolab.org Thu Jul 12 18:28:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Jul 2007 18:28:26 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.53,1.54
Message-ID: <20070712162826.16A9860C4D0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv1206/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
Remove code duplications.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- ChangeLog 12 Jul 2007 05:17:31 -0000 1.53
+++ ChangeLog 12 Jul 2007 16:28:23 -0000 1.54
@@ -8,6 +8,8 @@
fixed kolab/issue932 (Illegal values in webadmin cause LDAP errors)
https://intevation.de/roundup/kolab/issue932
+ Removed code duplications.
+
2007-07-11 Gunnar Wrobel
* www/admin/sharedfolder/sf.php.in:
From cvs at kolab.org Fri Jul 13 08:51:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 13 Jul 2007 08:51:31 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include
ldap.class.php, 1.29, 1.30
Message-ID: <20070713065131.8101160C4C0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv20261/kolab-webadmin/php/admin/include
Modified Files:
ldap.class.php
Log Message:
Fixed possible notices.
Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ldap.class.php 10 Jul 2007 15:39:48 -0000 1.29
+++ ldap.class.php 13 Jul 2007 06:51:29 -0000 1.30
@@ -117,7 +117,7 @@
$dn = $_SESSION['php_dn'];
$pw = $_SESSION['php_pw'];
}
- $this->is_bound = ldap_bind( $this->connection, $dn, $pw );
+ $this->is_bound = @ldap_bind( $this->connection, $dn, $pw );
if( $this->is_bound ) {
$this->bind_dn = $dn;
} else {
@@ -415,6 +415,9 @@
}
function addToDomainGroups( $member, $domains ) {
+ if (empty($domains)) {
+ return true;
+ }
foreach( $domains as $domain ) {
$domgrpdn = 'cn='.$this->dn_escape($domain).',cn=domains,cn=internal,'.$_SESSION['base_dn'];
$dom_obj = $this->read( $domgrpdn );
@@ -441,6 +444,9 @@
}
function removeFromDomainGroups( $member, $domains ) {
+ if (empty($domains)) {
+ return true;
+ }
foreach( $domains as $domain ) {
$domgrpdn = 'cn='.$this->dn_escape($domain).',cn=domains,cn=internal,'.$_SESSION['base_dn'];
$dom_obj = $this->read( $domgrpdn );
From cvs at kolab.org Fri Jul 13 08:51:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 13 Jul 2007 08:51:31 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.54,1.55
Message-ID: <20070713065131.7FB0260C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv20261/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
Fixed possible notices.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- ChangeLog 12 Jul 2007 16:28:23 -0000 1.54
+++ ChangeLog 13 Jul 2007 06:51:28 -0000 1.55
@@ -1,3 +1,9 @@
+2007-07-13 Gunnar Wrobel
+
+ * php/admin/include/ldap.class.php:
+
+ fixed possible PHP notices.
+
2007-07-12 Gunnar Wrobel
* www/admin/domainmaintainer/domainmaintainer.php.in:
From cvs at kolab.org Mon Jul 16 18:05:18 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 18:05:18 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates slapd.conf.template.in, 1.14,
1.14.2.1
Message-ID: <20070716160518.604B260C4D7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv1333/kolabd/kolabd/templates
Modified Files:
Tag: kolab_2_1_branch
slapd.conf.template.in
Log Message:
Reverted kolabAllowSMTPRecipient changes for kolab_2_1_branch:
cvs diff -u -d -r1.19 -r1.20 kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in|patch -p0 -s -R
cvs diff -u -d -r1.13 -r1.14 kolabd/kolabd/templates/slapd.conf.template.in|patch -p0 -s -R
cvs diff -u -d -r1.22 -r1.24 kolabd/kolabd/kolab2.schema|patch -p0 -s -R
Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- slapd.conf.template.in 2 Jul 2007 21:17:34 -0000 1.14
+++ slapd.conf.template.in 16 Jul 2007 16:05:16 -0000 1.14.2.1
@@ -134,11 +134,6 @@
by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
by * read stop
-access to attrs=kolabAllowSMTPRecipient
- by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
- by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
- by self read stop
-
access to dn="cn=nobody,@@@base_dn@@@"
by anonymous auth stop
From cvs at kolab.org Mon Jul 16 18:05:18 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 18:05:18 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/user
user.php.in, 1.23, 1.23.2.1
Message-ID: <20070716160518.60DCB60C4D8@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv1333/kolab-webadmin/kolab-webadmin/www/admin/user
Modified Files:
Tag: kolab_2_1_branch
user.php.in
Log Message:
Reverted kolabAllowSMTPRecipient changes for kolab_2_1_branch:
cvs diff -u -d -r1.19 -r1.20 kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in|patch -p0 -s -R
cvs diff -u -d -r1.13 -r1.14 kolabd/kolabd/templates/slapd.conf.template.in|patch -p0 -s -R
cvs diff -u -d -r1.22 -r1.24 kolabd/kolabd/kolab2.schema|patch -p0 -s -R
Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -d -r1.23 -r1.23.2.1
--- user.php.in 12 Jul 2007 16:28:23 -0000 1.23
+++ user.php.in 16 Jul 2007 16:05:16 -0000 1.23.2.1
@@ -148,49 +148,6 @@
return '';
}
-function checksmtprecipient ( $form, $key, $value ) {
- $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
- $str = '';
- foreach( $lst as $SMTPRecipient ) {
- $trimmed = ltrim($SMTPRecipient, "-."); // potentially every entry is negated with a '-'
- // $SMTPRecipient is either an
- // - email address
- // - local part of an email address with an @ suffix
- // - a domain part
-
- if (! ( valid_email_address($SMTPRecipient)
- | valid_domain($SMTPRecipient)
- | valid_local_part($SMTPRecipient))
- return sprintf(_("Syntax for Recipient %s is invalid"), $SMTPRecipient);
- }
- }
- return '';
-}
-
-
-function valid_email_address($address) {
-// the following addresses are invalid
-// email1.. at kolab.org
-// email1.- at kolab.org
-// email1._ at kolab.org
-// email1 at 2sub.kolab.org
-// email1 at sub.sub.2sub.kolab.org
- return preg_match("/^[a-z]+[a-z0-9]*[\.|\-|_]?[a-z0-9]+@([a-z]+[a-z0-9]*[\.|\-]?[a-z]+[a-z0-9]*[a-z0-9]+){1,4}\.[a-z]{2,4}$/i", $address));
-}
-
-function valid_domain($domain) {
-// the following subdomains are invalid
-// 2sub.kolab.org
-// sub.sub.2sub.kolab.org
- return preg_match("/^[a-z]+[a-z0-9]*[\.|\-]?[a-z]+[a-z0-9]*[a-z0-9]+){1,4}\.[a-z]{2,4}$/i", $domain));
-}
-
-function valid_local_part($local_part) {
- // the local part always has an @ appended
- return preg_match("/^[a-z]+[a-z0-9]*[\.|\-|_]?[a-z0-9]+@/i", $local_part));
-}
-
-
// Check uid/gid used in invitation policy
// We're pretty relaxed about what is entered
// here and only check some basic syntax
@@ -478,12 +435,6 @@
'validation' => 'checkdelegate',
'comment' => _('Others allowed to send emails with a "from" address of this account.') . ' ' .
_('One email address per line.') );
-
-$entries['kolabAllowSMTPRecipient'] =array( 'name' => _('Allowed Recipients'),
- 'type' => 'textarea',
- 'validation' => 'checksmtprecipient',
- 'comment' => _('restrict allowed recipients of SMTP messages') . ' ' .
- _('One entry per line.') );
$entries['title_0'] = array( 'name' => _('Title') );
$entries['o_0'] = array( 'name' => _('Organisation') );
From cvs at kolab.org Mon Jul 16 18:05:18 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 18:05:18 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd kolab2.schema,1.24,1.24.2.1
Message-ID: <20070716160518.6249260C4D9@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv1333/kolabd/kolabd
Modified Files:
Tag: kolab_2_1_branch
kolab2.schema
Log Message:
Reverted kolabAllowSMTPRecipient changes for kolab_2_1_branch:
cvs diff -u -d -r1.19 -r1.20 kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in|patch -p0 -s -R
cvs diff -u -d -r1.13 -r1.14 kolabd/kolabd/templates/slapd.conf.template.in|patch -p0 -s -R
cvs diff -u -d -r1.22 -r1.24 kolabd/kolabd/kolab2.schema|patch -p0 -s -R
Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -d -r1.24 -r1.24.2.1
--- kolab2.schema 2 Jul 2007 21:17:34 -0000 1.24
+++ kolab2.schema 16 Jul 2007 16:05:16 -0000 1.24.2.1
@@ -1,23 +1,23 @@
# $Id$
# (c) 2003, 2004 Tassilo Erlewein
-# (c) 2003-2007 Martin Konold
+# (c) 2003-2006 Martin Konold
# (c) 2003 Achim Frank
#
-# Redistribution and use in source and binary forms, with or without
+# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
-# Redistributions of source code must retain the above copyright notice, this
+# Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
#
-# Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
-# The name of the author may not be used to endorse or promote products derived
+# The name of the author may not be used to endorse or promote products derived
# from this software without specific prior written permission.
#
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -123,7 +123,7 @@
# For user, group and resource Kolab accounts
# Describes how to respond to invitations
-# We keep the attribute as a string, but actually it can only have one
+# We keep the attribute as a string, but actually it can only have one
# of the following values:
#
# ACT_ALWAYS_ACCEPT
@@ -171,11 +171,11 @@
SINGLE-VALUE )
# Begin date of Kolab vacation period. Sender will
-# be notified every kolabVacationResendIntervall days
+# be notified every kolabVacationResendIntervall days
# that recipient is absent until kolabVacationEnd.
# Values in this syntax are encoded as printable strings,
-# represented as specified in X.208.
-# Note that the time zone must be specified.
+# represented as specified in X.208.
+# Note that the time zone must be specified.
# For Kolab we limit ourself to GMT
# YYYYMMDDHHMMZ e.g. 200512311458Z.
# see also: rfc 2252.
@@ -270,7 +270,7 @@
NAME 'kolabForwardKeepCopy'
DESC 'Keep copy when forwarding'
EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
# Enable forwarding of UCE.
@@ -296,27 +296,6 @@
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
-# describes the allowed or disallowed smtp addresses for
-# recipients. If this attribute is not set for a user no
-# kolab recipient policy does apply.
-# example entries:
-# .tld - allow mail to every recipient for this tld
-# domain.tld - allow mail to everyone in domain.tld
-# .domain.tld - allow mail to everyone in domain.tld and its subdomains
-# user at domain.tld - allow mail to explicit user at domain.tld
-# user@ - allow mail to this user but any domain
-# -.tld - disallow mail to every recipient for this tld
-# -domain.tld - disallow mail to everyone in domain.tld
-# -.domain.tld - disallow mail to everyone in domain.tld and its subdomains
-# -user at domain.tld - disallow mail to explicit user at domain.tld
-# -user@ - disallow mail to this user but any domain
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.18
- NAME 'kolabAllowSMTPRecipient'
- DESC 'SMTP address allowed for destination (multi-valued)'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{512} )
-
# kolabFolderType describes the kind of Kolab folder
# as defined in the kolab format specification.
# We will annotate all folders with an entry
@@ -384,7 +363,7 @@
attributetype ( 1.3.6.1.4.1.19414.2.1.507
NAME 'postfix-enable-virus-scan'
EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.19414.2.1.508
@@ -514,13 +493,6 @@
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-# Enable the Kolab Policy Daemon. If false or not
-# set don't use the Kolab Policy Daemon
-attributetype ( 1.3.6.1.4.1.19414.2.1.800
- NAME 'kolabPolicyDaemon'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
######################
# proftpd attributes #
######################
@@ -546,7 +518,7 @@
# main kolab server configuration
# storing global values and user specific default values
# like kolabFreeBusyFuture and kolabFreeBusyPast
-objectclass ( 1.3.6.1.4.1.19414.2.2.1
+objectclass ( 1.3.6.1.4.1.19414.2.2.1
NAME 'kolab'
DESC 'Kolab server configuration'
SUP top STRUCTURAL
@@ -575,7 +547,6 @@
kolabfilter-verify-from-header $
kolabfilter-allow-sender-header $
kolabfilter-reject-forged-from-header $
- kolabPolicyDaemon $
proftpd-ftp $
proftpd-defaultquota $
kolabFreeBusyFuture $
@@ -640,7 +611,6 @@
kolabForwardAddress $
kolabForwardKeepCopy $
kolabForwardUCE $
- kolabAllowSMTPRecipient $
kolabDeleteflag $
kolabComment ) )
@@ -665,15 +635,15 @@
alias ) )
# kolab groupOfNames with extra kolabDeleteflag and the required
-# attribute mail.
-# The mail attribute for kolab objects of the type kolabGroupOfNames
-# is not arbitrary but MUST be a single attribute of the form
+# attribute mail.
+# The mail attribute for kolab objects of the type kolabGroupOfNames
+# is not arbitrary but MUST be a single attribute of the form
# of an valid SMTP address with the CN as the local part.
-# E.g cn at kolabdomain (e.g. employees at mydomain.com). The
-# mail attribute MUST be globally unique.
-objectclass ( 1.3.6.1.4.1.19414.3.2.5
- NAME 'kolabGroupOfNames'
- DESC 'Kolab group of names (DNs) derived from RFC2256'
- SUP groupOfNames STRUCTURAL
- MAY ( mail $
+# E.g cn at kolabdomain (e.g. employees at mydomain.com). The
+# mail attribute MUST be globally unique.
+objectclass ( 1.3.6.1.4.1.19414.3.2.5
+ NAME 'kolabGroupOfNames'
+ DESC 'Kolab group of names (DNs) derived from RFC2256'
+ SUP groupOfNames STRUCTURAL
+ MAY ( mail $
kolabDeleteflag ) )
From cvs at kolab.org Mon Jul 16 18:52:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 18:52:35 +0200 (CEST)
Subject: thomas: server Makefile,1.19,1.19.2.1
Message-ID: <20070716165235.ECD1F60C4BF@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv2879
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Make global Makefile abort on errors in for loop, use make -C instead of cd.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- Makefile 11 Jul 2007 14:38:06 -0000 1.19
+++ Makefile 16 Jul 2007 16:52:33 -0000 1.19.2.1
@@ -24,14 +24,14 @@
dist:
rm -rf stage
mkdir stage
- for PKG in $(BASE_PACKAGES); \
- do \
- cd $$PKG && make dist;cd ..;\
+ for PKG in $(BASE_PACKAGES); \
+ do \
+ make -C $$PKG dist || exit $?; \
done
- cd perl-kolab && make -f Makefile.cvs dist
- for PKG in $(KOLAB_PACKAGES); \
- do \
- cd $$PKG && make dist;cd ..;\
+ make -C perl-kolab -f Makefile.cvs dist
+ for PKG in $(KOLAB_PACKAGES); \
+ do \
+ make -C $$PKG dist || exit $?; \
done
cp $(BASE_FILES) stage/
echo 'Remember to update obmtool.conf!'
@@ -57,12 +57,12 @@
horde/horde-turba
.PHONY: dist-horde
-dist-horde:
+dist-horde:
rm -rf stage
mkdir -p stage
for PKG in $(HORDE_PACKAGES); \
do \
- cd $$PKG && make dist;cd ../..; \
+ make -C $$PKG dist || exit $?; \
echo -e "\n==" >> stage/ChangeLog; \
echo "$$PKG" >> stage/ChangeLog; \
echo -e "==\n" >> stage/ChangeLog; \
@@ -72,5 +72,5 @@
cp obmtool-webclient.conf stage/obmtool.conf
.PHONY: clean
-clean:
- rm -rf stage
\ No newline at end of file
+clean:
+ rm -rf stage
From cvs at kolab.org Mon Jul 16 19:29:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:29:15 +0200 (CEST)
Subject: thomas: server/amavisd Makefile,1.2,1.2.2.1
Message-ID: <20070716172915.9275260C4BF@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/amavisd
In directory doto:/tmp/cvs-serv3831/amavisd
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Download OpenPKG source rpms from Kolab ftp mirror instead of OpenPKG.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/amavisd/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile 26 Apr 2007 15:15:36 -0000 1.2
+++ Makefile 16 Jul 2007 17:29:13 -0000 1.2.2.1
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC/PLUS/
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=2.5.0_kolab
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
From cvs at kolab.org Mon Jul 16 19:29:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:29:15 +0200 (CEST)
Subject: thomas: server/imapd Makefile,1.30,1.30.2.1
Message-ID: <20070716172915.A6E7A60C4D9@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv3831/imapd
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Download OpenPKG source rpms from Kolab ftp mirror instead of OpenPKG.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -d -r1.30 -r1.30.2.1
--- Makefile 6 Nov 2006 13:22:36 -0000 1.30
+++ Makefile 16 Jul 2007 17:29:13 -0000 1.30.2.1
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=2.5.0_kolab2
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
PATCHES=$(KOLABCVSDIR)/cyradm.annotate.patch \
$(KOLABCVSDIR)/imapd.annotate.patch \
From cvs at kolab.org Mon Jul 16 19:29:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:29:15 +0200 (CEST)
Subject: thomas: server/imap Makefile,1.6,1.6.2.1
Message-ID: <20070716172915.A120D60C4D8@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/imap
In directory doto:/tmp/cvs-serv3831/imap
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Download OpenPKG source rpms from Kolab ftp mirror instead of OpenPKG.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imap/Makefile,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- Makefile 6 Nov 2006 13:22:36 -0000 1.6
+++ Makefile 16 Jul 2007 17:29:13 -0000 1.6.2.1
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=2.5.0_kolab
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
PATCHES=$(KOLABCVSDIR)/imap.annotate.patch
From cvs at kolab.org Mon Jul 16 19:29:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:29:15 +0200 (CEST)
Subject: thomas: server/openldap Makefile,1.18,1.18.2.1
Message-ID: <20070716172915.AA19E60C4DA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/openldap
In directory doto:/tmp/cvs-serv3831/openldap
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Download OpenPKG source rpms from Kolab ftp mirror instead of OpenPKG.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -d -r1.18 -r1.18.2.1
--- Makefile 10 Jan 2007 16:25:25 -0000 1.18
+++ Makefile 16 Jul 2007 17:29:13 -0000 1.18.2.1
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/stable/2.20061018/SRC/BASE
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=2.20061110_kolab
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
From cvs at kolab.org Mon Jul 16 19:29:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:29:15 +0200 (CEST)
Subject: thomas: server/clamav Makefile,1.4,1.4.2.1
Message-ID: <20070716172915.9D20D60C4D3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv3831/clamav
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Download OpenPKG source rpms from Kolab ftp mirror instead of OpenPKG.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- Makefile 1 Jun 2007 15:42:41 -0000 1.4
+++ Makefile 16 Jul 2007 17:29:13 -0000 1.4.2.1
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC/EVAL/
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=20070531_kolab
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
From cvs at kolab.org Mon Jul 16 19:29:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:29:15 +0200 (CEST)
Subject: thomas: server/postfix Makefile,1.16,1.16.2.1
Message-ID: <20070716172915.B2C6B60C4DC@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/postfix
In directory doto:/tmp/cvs-serv3831/postfix
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Download OpenPKG source rpms from Kolab ftp mirror instead of OpenPKG.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- Makefile 6 Nov 2006 13:22:37 -0000 1.16
+++ Makefile 16 Jul 2007 17:29:13 -0000 1.16.2.1
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=2.5.0_kolab
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
PATCHES=$(KOLABCVSDIR)/postfix-ldap-leafonly.patch \
$(KOLABCVSDIR)/postfix-pipe-allow-empty-sender.patch
From cvs at kolab.org Mon Jul 16 19:29:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:29:15 +0200 (CEST)
Subject: thomas: server/apache Makefile,1.25,1.25.2.1
Message-ID: <20070716172915.9DF4C60C4D7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/apache
In directory doto:/tmp/cvs-serv3831/apache
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Download OpenPKG source rpms from Kolab ftp mirror instead of OpenPKG.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- Makefile 15 Mar 2007 14:12:44 -0000 1.25
+++ Makefile 16 Jul 2007 17:29:13 -0000 1.25.2.1
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/UPD
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=2.5.6_kolab2
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
PATCHES = $(KOLABCVSDIR)/mod_auth_ldap.patch \
$(KOLABCVSDIR)/../php/php-getacl-backport.patch \
From cvs at kolab.org Mon Jul 16 19:29:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:29:15 +0200 (CEST)
Subject: thomas: server/spamassassin Makefile,1.1,1.1.2.1
Message-ID: <20070716172915.B2CCD60C4DD@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/spamassassin
In directory doto:/tmp/cvs-serv3831/spamassassin
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Download OpenPKG source rpms from Kolab ftp mirror instead of OpenPKG.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/spamassassin/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile 17 Apr 2007 14:05:17 -0000 1.1
+++ Makefile 16 Jul 2007 17:29:13 -0000 1.1.2.1
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/UPD
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=2.5.1_kolab
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
From cvs at kolab.org Mon Jul 16 19:29:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:29:15 +0200 (CEST)
Subject: thomas: server/php Makefile,1.7,1.7.2.1
Message-ID: <20070716172915.B27BD60C4DB@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv3831/php
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Download OpenPKG source rpms from Kolab ftp mirror instead of OpenPKG.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Makefile 20 Apr 2007 15:28:28 -0000 1.7
+++ Makefile 16 Jul 2007 17:29:13 -0000 1.7.2.1
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/UPD
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=2.5.2_kolab2
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
PATCHES = $(KOLABCVSDIR)/php-getacl-backport.patch \
$(KOLABCVSDIR)/php-imap-annotation.patch \
From cvs at kolab.org Mon Jul 16 19:29:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:29:15 +0200 (CEST)
Subject: thomas: server/file Makefile,1.3,1.3.2.1
Message-ID: <20070716172915.9DE9B60C4D5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/file
In directory doto:/tmp/cvs-serv3831/file
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Download OpenPKG source rpms from Kolab ftp mirror instead of OpenPKG.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/file/Makefile,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- Makefile 17 Apr 2007 11:07:55 -0000 1.3
+++ Makefile 16 Jul 2007 17:29:13 -0000 1.3.2.1
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=2.5.0_kolab2
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
From cvs at kolab.org Mon Jul 16 19:41:18 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 16 Jul 2007 19:41:18 +0200 (CEST)
Subject: thomas: server Makefile,1.19.2.1,1.19.2.2
Message-ID: <20070716174118.D1AE760C4BF@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv4239
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Fix Makefile for perl-kolab and kolab*
For some reason unknown to me autoconf fails if make -C is used here.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -d -r1.19.2.1 -r1.19.2.2
--- Makefile 16 Jul 2007 16:52:33 -0000 1.19.2.1
+++ Makefile 16 Jul 2007 17:41:16 -0000 1.19.2.2
@@ -28,10 +28,10 @@
do \
make -C $$PKG dist || exit $?; \
done
- make -C perl-kolab -f Makefile.cvs dist
- for PKG in $(KOLAB_PACKAGES); \
- do \
- make -C $$PKG dist || exit $?; \
+ cd perl-kolab && make -f Makefile.cvs dist
+ for PKG in $(KOLAB_PACKAGES); \
+ do \
+ cd $$PKG && make dist || exit $?; cd ..; \
done
cp $(BASE_FILES) stage/
echo 'Remember to update obmtool.conf!'
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server/clamav .cvsignore, 1.1, NONE Makefile, 1.4,
NONE kolab.patch, 1.5, NONE
Message-ID: <20070717145935.65C3F60C4C8@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv13733/clamav
Removed Files:
.cvsignore Makefile kolab.patch
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- kolab.patch DELETED ---
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server/apache .cvsignore, 1.1, NONE Makefile, 1.25,
NONE kolab.patch, 1.11, NONE mod_auth_ldap.patch, 1.1, NONE
Message-ID: <20070717145935.62CE060C4C6@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/apache
In directory doto:/tmp/cvs-serv13733/apache
Removed Files:
.cvsignore Makefile kolab.patch mod_auth_ldap.patch
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- kolab.patch DELETED ---
--- mod_auth_ldap.patch DELETED ---
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server/db Makefile,1.4,NONE kolab.patch,1.1,NONE
Message-ID: <20070717145935.6861A60C4C9@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/db
In directory doto:/tmp/cvs-serv13733/db
Removed Files:
Makefile kolab.patch
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- Makefile DELETED ---
--- kolab.patch DELETED ---
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server/amavisd .cvsignore, 1.1, NONE Makefile, 1.2,
NONE kolab.patch, 1.2, NONE undecipherable_subject.patch, 1.1, NONE
Message-ID: <20070717145935.62D9160C4C7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/amavisd
In directory doto:/tmp/cvs-serv13733/amavisd
Removed Files:
.cvsignore Makefile kolab.patch undecipherable_subject.patch
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- kolab.patch DELETED ---
--- undecipherable_subject.patch DELETED ---
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server/imapd .cvsignore, 1.1, NONE Makefile, 1.30, NONE README,
1.3, NONE cyradm.annotate.patch, 1.2, NONE imapd-goodchars.patch,
1.1, NONE imapd-murder.patch, 1.1, NONE imapd.annotate.patch,
1.1, NONE imapd.folderchar.patch, 1.1, NONE imapd.group2.patch,
1.1, NONE imapd.morelogging.patch, 1.2, NONE kolab-ldap.patch,
1.4, NONE kolab.patch, 1.30, NONE
Message-ID: <20070717145935.79AF560C4CE@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv13733/imapd
Removed Files:
.cvsignore Makefile README cyradm.annotate.patch
imapd-goodchars.patch imapd-murder.patch imapd.annotate.patch
imapd.folderchar.patch imapd.group2.patch
imapd.morelogging.patch kolab-ldap.patch kolab.patch
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- README DELETED ---
--- cyradm.annotate.patch DELETED ---
--- imapd-goodchars.patch DELETED ---
--- imapd-murder.patch DELETED ---
--- imapd.annotate.patch DELETED ---
--- imapd.folderchar.patch DELETED ---
--- imapd.group2.patch DELETED ---
--- imapd.morelogging.patch DELETED ---
--- kolab-ldap.patch DELETED ---
--- kolab.patch DELETED ---
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server obmtool,1.8,NONE obmtool.conf,1.256,NONE
Message-ID: <20070717145935.5E6B560C4C5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv13733
Removed Files:
obmtool obmtool.conf
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- obmtool DELETED ---
--- obmtool.conf DELETED ---
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server/file .cvsignore, 1.1, NONE Makefile, 1.3,
NONE file-cve-2007-1536.patch, 1.1, NONE kolab.patch, 1.2, NONE
Message-ID: <20070717145935.6C67960C4CA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/file
In directory doto:/tmp/cvs-serv13733/file
Removed Files:
.cvsignore Makefile file-cve-2007-1536.patch kolab.patch
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- file-cve-2007-1536.patch DELETED ---
--- kolab.patch DELETED ---
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server/spamassassin .cvsignore, 1.1, NONE Makefile, 1.1,
NONE spamassassin-cve-2007-0451.patch, 1.1, NONE
Message-ID: <20070717145935.83E1160C4D5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/spamassassin
In directory doto:/tmp/cvs-serv13733/spamassassin
Removed Files:
.cvsignore Makefile spamassassin-cve-2007-0451.patch
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- spamassassin-cve-2007-0451.patch DELETED ---
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server/imap .cvsignore, 1.1, NONE Makefile, 1.6, NONE README,
1.1, NONE imap.annotate.patch, 1.2, NONE kolab.patch, 1.4, NONE
Message-ID: <20070717145935.716DF60C4CD@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/imap
In directory doto:/tmp/cvs-serv13733/imap
Removed Files:
.cvsignore Makefile README imap.annotate.patch kolab.patch
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- README DELETED ---
--- imap.annotate.patch DELETED ---
--- kolab.patch DELETED ---
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server/postfix .cvsignore, 1.1, NONE Makefile, 1.16,
NONE kolab.patch, 1.5, NONE postfix-ldap-leafonly.patch, 1.2,
NONE postfix-pipe-allow-empty-sender.patch, 1.2,
NONE postfix-pipe.patch, 1.1, NONE
Message-ID: <20070717145935.7F2E360C4D4@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/postfix
In directory doto:/tmp/cvs-serv13733/postfix
Removed Files:
.cvsignore Makefile kolab.patch postfix-ldap-leafonly.patch
postfix-pipe-allow-empty-sender.patch postfix-pipe.patch
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- kolab.patch DELETED ---
--- postfix-ldap-leafonly.patch DELETED ---
--- postfix-pipe-allow-empty-sender.patch DELETED ---
--- postfix-pipe.patch DELETED ---
From cvs at kolab.org Tue Jul 17 16:59:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 16:59:35 +0200 (CEST)
Subject: thomas: server/php .cvsignore, 1.1, NONE Makefile, 1.7,
NONE kolab.patch, 1.4, NONE php-getacl-backport.patch, 1.1,
NONE php-imap-annotation.patch, 1.1,
NONE php-imap-status-current.patch, 1.1, NONE
Message-ID: <20070717145935.7DECC60C4D3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv13733/php
Removed Files:
.cvsignore Makefile kolab.patch php-getacl-backport.patch
php-imap-annotation.patch php-imap-status-current.patch
Log Message:
Removed files that are not part of Kolab server 2.2-beta1
Many patches have been accepted upstream or exist as patches to the
used OpenPKG versions.
obmtool is mostly superceded by the 'openpkg build' command.
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- kolab.patch DELETED ---
--- php-getacl-backport.patch DELETED ---
--- php-imap-annotation.patch DELETED ---
--- php-imap-status-current.patch DELETED ---
From cvs at kolab.org Tue Jul 17 17:07:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:07:17 +0200 (CEST)
Subject: thomas: server/kolab-horde-fbview Makefile, 1.5,
1.6 kolab-horde-fbview.spec, 1.7, 1.8
Message-ID: <20070717150717.BF45460C4C5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-horde-fbview
In directory doto:/tmp/cvs-serv14170/kolab-horde-fbview
Modified Files:
Makefile kolab-horde-fbview.spec
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 20 Apr 2007 14:56:10 -0000 1.5
+++ Makefile 17 Jul 2007 15:07:15 -0000 1.6
@@ -3,8 +3,8 @@
endif
PACKAGE = kolab-horde-fbview
-VERSION = 2.1.0
-RELEASE = 20070420
+VERSION = 2.1.99
+RELEASE = 20070607
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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab-horde-fbview.spec 20 Apr 2007 14:56:10 -0000 1.7
+++ kolab-horde-fbview.spec 17 Jul 2007 15:07:15 -0000 1.8
@@ -1,5 +1,5 @@
# Versions
-%define V_kolab_fbview 2.1.0
+%define V_kolab_fbview 2.1.99
# Package Information
Name: kolab-horde-fbview
@@ -7,7 +7,7 @@
URL: http://www.kolab.org/
Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB)
Version: %{V_kolab_fbview}
-Release: 20070420
+Release: 20070607
Class: JUNK
License: GPL
Group: MAIL
@@ -19,8 +19,8 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: 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
+BuildPreReq: php, php::with_pear = yes
+PreReq: kolabd >= 2.1.99-20070607, kolab-horde-framework >= 2.1.99-20070607
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Tue Jul 17 17:07:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:07:17 +0200 (CEST)
Subject: thomas: server/kolab-horde-fbview/kolab-horde-fbview/fbview/po
translation.php, 1.1, 1.2
Message-ID: <20070717150717.C2EDB60C4C6@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/po
In directory doto:/tmp/cvs-serv14170/kolab-horde-fbview/kolab-horde-fbview/fbview/po
Modified Files:
translation.php
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: translation.php
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/po/translation.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- translation.php 31 Oct 2005 11:43:30 -0000 1.1
+++ translation.php 17 Jul 2007 15:07:15 -0000 1.2
@@ -1,4 +1,4 @@
-#!/kolab/bin/php -c /kolab/etc/apache/php.ini
+#!/kolab/bin/php -c /kolab/etc/apache2/php.ini
Author: thomas
Update of /kolabrepository/server/kolab-horde-framework
In directory doto:/tmp/cvs-serv14170/kolab-horde-framework
Modified Files:
Makefile kolab-horde-framework.spec
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-horde-framework/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 20 Apr 2007 14:56:10 -0000 1.5
+++ Makefile 17 Jul 2007 15:07:15 -0000 1.6
@@ -4,8 +4,8 @@
endif
PACKAGE = kolab-horde-framework
-VERSION = 2.1.0
-RELEASE = 20070420
+VERSION = 2.1.99
+RELEASE = 20070607
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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab-horde-framework.spec 20 Apr 2007 14:56:10 -0000 1.8
+++ kolab-horde-framework.spec 17 Jul 2007 15:07:15 -0000 1.9
@@ -1,6 +1,6 @@
# Versions
%define V_php_horde_pear 1.3
-%define V_kolab_horde 2.1.0
+%define V_kolab_horde 2.1.99
# Package Information
Name: kolab-horde-framework
@@ -8,7 +8,7 @@
URL: http://www.kolab.org/
Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB)
Version: %{V_kolab_horde}
-Release: 20070420
+Release: 20070607
Class: JUNK
License: GPL
Group: MAIL
@@ -21,8 +21,8 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: apache, php, php::with_pear = yes
-PreReq: kolabd >= 2.1.0-20070420, apache, php, php::with_pear = yes
+BuildPreReq: php, php::with_pear = yes
+PreReq: kolabd >= 2.1.99-20070607
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Tue Jul 17 17:07:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:07:17 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/dist_conf kolab,1.42,1.43
Message-ID: <20070717150717.D9E5960C4D3@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv14170/kolabd/kolabd/dist_conf
Modified Files:
kolab
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- kolab 11 Feb 2007 14:47:51 -0000 1.42
+++ kolab 17 Jul 2007 15:07:15 -0000 1.43
@@ -31,7 +31,7 @@
pkgdocdir=${datadir}/doc
# /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
-perllib=${libdir}/perl/vendor_perl/5.8.7
+perllib=${libdir}/perl/vendor_perl/5.8.8
amavisd_conffile=${sysconfdir}/amavisd/amavisd.conf
amavisd_templatedir=${sysconfdir}/amavisd/templates
@@ -145,15 +145,15 @@
webserver_document_root=${localstatedir}/kolab/www
webserver_cgidir=${webserver_document_root}/cgi-bin
webserver_sessions=${localstatedir}/kolab/httpd_sessions
-webserver_logdir=${localstatedir}/apache/log
+webserver_logdir=${localstatedir}/apache2/log
webserver_acceptlock=${webserver_logdir}/accept.lock
webserver_runtime_status=${webserver_logdir}/apache_runtime_status
webserver_errorlogfile=${webserver_logdir}/apache-error.log
webserver_accesslogfile=${webserver_logdir}/apache-access.log
-webserver_confdir=${sysconfdir}/apache
-webserver_pidfile=${localstatedir}/apache/run/apache.pid
-webserver_mime_magicfile=${sysconfdir}/apache/mime.magic
-webserver_mime_typesfile=${sysconfdir}/apache/mime.types
+webserver_confdir=${sysconfdir}/apache2
+webserver_pidfile=${localstatedir}/apache2/run/apache2.pid
+webserver_mime_magicfile=${sysconfdir}/apache2/mime.magic
+webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
webserver_sslscache=${webserver_logdir}/ssl_scache
webserver_sslmutex=${webserver_logdir}/ssl_mutex
# webserver_web_prefix is empty indeed
@@ -161,9 +161,9 @@
webserver_musr=kolab
webserver_usr=${kolab_usr}
webserver_grp=${kolab_grp}
-webserver_rpm=apache
+webserver_rpm=apache2
-phpini_dir=${sysconfdir}/apache
+phpini_dir=${sysconfdir}/apache2
phplibdir=${libdir}/php
phplibdir2=${kolab_statedir}/php
phppeardir=${phplibdir2}/pear
From cvs at kolab.org Tue Jul 17 17:07:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:07:17 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd configure.ac, 1.9, 1.10 kolabd.spec.in,
1.10, 1.11
Message-ID: <20070717150717.D7D5860C4CD@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv14170/kolabd/kolabd
Modified Files:
configure.ac kolabd.spec.in
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.ac 17 Apr 2007 14:44:36 -0000 1.9
+++ configure.ac 17 Jul 2007 15:07:15 -0000 1.10
@@ -1,7 +1,7 @@
AC_PREREQ(2.59)
# not the real version
-m4_define(_VERSION,2.1.0)
+m4_define(_VERSION,2.1.99)
AC_INIT([kolabd],[_VERSION],[kolab-devel at kolab.org])
AC_CONFIG_AUX_DIR(.)
Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolabd.spec.in 3 Jul 2007 16:35:46 -0000 1.10
+++ kolabd.spec.in 17 Jul 2007 15:07:15 -0000 1.11
@@ -26,7 +26,7 @@
# package version
%define V_ei_maj 2.1
-%define V_ei_min 0
+%define V_ei_min 99
# package information
Name: kolabd
@@ -48,16 +48,23 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-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.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-20070420, perl-db
-PreReq: amavisd >= 2.3.3-2.5.0
-PreReq: clamav >= 0.90-20070214
+BuildPreReq: OpenPKG, openpkg >= 20070603
+PreReq: OpenPKG, openpkg >= 20070603
+
+PreReq: postfix, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
+PreReq: sasl::with_ldap = yes, sasl::with_login = yes
+PreReq: amavisd
+PreReq: clamav >= 0.90
+PreReq: imap, imap::with_annotate = yes
+PreReq: php, php::with_zlib = yes, php::with_bdb = yes, php::with_gettext = yes, php::with_imap = yes, php::with_imap_annotate = yes, php::with_openldap = yes, php::with_pear = yes, php::with_xml = yes, php::with_dom = yes, php::with_ssl = yes, php::with_mbstring = yes, php::with_mm = yes
+PreReq: apache2, apache2::with_mod_dav = yes, apache2::with_mod_ssl = yes, apache2::with_mod_ldap = yes
+PreReq: apache2-php, apache2-php::with_zlib = yes, apache2-php::with_bdb = yes, apache2-php::with_gettext = yes, apache2-php::with_imap = yes, apache2-php::with_imap_annotate = yes, apache2-php::with_openldap = yes, apache2-php::with_pear = yes, apache2-php::with_xml = yes, apache2-php::with_dom = yes, apache2-php::with_ssl = yes, apache2-php::with_mbstring = yes, apache2-php::with_mm = yes
+PreReq: imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes
+PreReq: proftpd, proftpd::with_ldap = yes
+PreReq: perl-ssl
+PreReq: perl-www
+PreReq: perl-ldap
+PreReq: perl-kolab >= 5.8.8-20070607
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Tue Jul 17 17:07:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:07:17 +0200 (CEST)
Subject: thomas: server/kolab-webadmin/kolab-webadmin configure.ac, 1.25,
1.26 kolab-webadmin.spec.in, 1.18, 1.19
Message-ID: <20070717150717.D1D8960C4CA@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv14170/kolab-webadmin/kolab-webadmin
Modified Files:
configure.ac kolab-webadmin.spec.in
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- configure.ac 17 Apr 2007 14:44:36 -0000 1.25
+++ configure.ac 17 Jul 2007 15:07:15 -0000 1.26
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-m4_define(_VERSION,2.1.0)
+m4_define(_VERSION,2.1.99)
AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel at kolab.org])
AC_CONFIG_SRCDIR(php/admin/include/ldap.class.php)
AC_CONFIG_AUX_DIR(.)
Index: kolab-webadmin.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- kolab-webadmin.spec.in 21 Jun 2007 17:36:15 -0000 1.18
+++ kolab-webadmin.spec.in 17 Jul 2007 15:07:15 -0000 1.19
@@ -41,10 +41,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-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
+BuildPreReq: OpenPKG, openpkg >= 20070603
+PreReq: OpenPKG, openpkg >= 20070603
+PreReq: kolabd >= 2.1.99-20070607
+PreReq: php-smarty >= 2.6.18
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Tue Jul 17 17:07:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:07:17 +0200 (CEST)
Subject: thomas: server/perl-kolab configure.ac,1.4,1.5
Message-ID: <20070717150717.DE58060C4D5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv14170/perl-kolab
Modified Files:
configure.ac
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/perl-kolab/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.ac 9 Mar 2006 21:23:22 -0000 1.4
+++ configure.ac 17 Jul 2007 15:07:15 -0000 1.5
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
-m4_define(_VERSION,5.8.7)
+m4_define(_VERSION,5.8.8)
AC_INIT([perl-kolab],[_VERSION],[kolab-devel at kolab.org])
AC_CONFIG_AUX_DIR(.)
From cvs at kolab.org Tue Jul 17 17:07:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:07:17 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers
configure.ac, 1.5, 1.6 kolab-resource-handlers.spec.in, 1.6, 1.7
Message-ID: <20070717150717.CD80060C4C9@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers
In directory doto:/tmp/cvs-serv14170/kolab-resource-handlers/kolab-resource-handlers
Modified Files:
configure.ac kolab-resource-handlers.spec.in
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.ac 17 Apr 2007 14:44:36 -0000 1.5
+++ configure.ac 17 Jul 2007 15:07:15 -0000 1.6
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
-m4_define(_VERSION,2.1.0)
+m4_define(_VERSION,2.1.99)
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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab-resource-handlers.spec.in 20 Apr 2007 14:56:10 -0000 1.6
+++ kolab-resource-handlers.spec.in 17 Jul 2007 15:07:15 -0000 1.7
@@ -19,8 +19,8 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: 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
+BuildPreReq: php, php::with_pear = yes
+PreReq: kolabd >= 2.1.99-20070607, kolab-horde-framework >= 2.1.99-20070607
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Tue Jul 17 17:07:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:07:17 +0200 (CEST)
Subject: thomas: server/php-smarty Makefile,1.4,1.5 php-smarty.spec,1.4,1.5
Message-ID: <20070717150717.E4E9360C4C6@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/php-smarty
In directory doto:/tmp/cvs-serv14170/php-smarty
Modified Files:
Makefile php-smarty.spec
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-smarty/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 20 Dec 2005 09:53:48 -0000 1.4
+++ Makefile 17 Jul 2007 15:07:15 -0000 1.5
@@ -1,8 +1,8 @@
RPM = /kolab/bin/openpkg rpm
NAME = Smarty
PACKAGE = php-smarty
-VERSION = 2.6.10
-RELEASE = 20051003
+VERSION = 2.6.18
+RELEASE = 20070607
KOLABRELEASE = $(RELEASE)
ifeq "x$(KOLABRPMSRC)" "x"
Index: php-smarty.spec
===================================================================
RCS file: /kolabrepository/server/php-smarty/php-smarty.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- php-smarty.spec 3 Oct 2005 03:03:11 -0000 1.4
+++ php-smarty.spec 17 Jul 2007 15:07:15 -0000 1.5
@@ -1,14 +1,14 @@
# Versions
-%define V_php 4.3.11
-%define V_Smarty 2.6.10
+%define V_php 5.2.3
+%define V_Smarty 2.6.18
# Package Information
Name: php-smarty
Summary: Template engine for PHP
URL: http://smarty.php.net/
Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB)
-Version: 2.6.10
-Release: 20051003
+Version: 2.6.18
+Release: 20070607
Class: JUNK
License: LGPL
Group: Languages
@@ -20,8 +20,6 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: apache >= 1.2.29
-PreReq: apache >= 1.2.29
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Tue Jul 17 17:07:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:07:17 +0200 (CEST)
Subject: thomas: server/perl-kolab/Kolab-Conf Conf.pm.in,1.11,1.12
Message-ID: <20070717150717.DF9C860C4C5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv14170/perl-kolab/Kolab-Conf
Modified Files:
Conf.pm.in
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Conf.pm.in 4 Jun 2007 06:41:10 -0000 1.11
+++ Conf.pm.in 17 Jul 2007 15:07:15 -0000 1.12
@@ -328,8 +328,8 @@
$Kolab::haschanged{'postfix'} = 1;
} elsif ($cfg =~ /saslauthd/) {
$Kolab::haschanged{'saslauthd'} = 1;
- } elsif ($cfg =~ /apache/) {
- $Kolab::haschanged{'apache'} = 1;
+ } elsif ($cfg =~ /apache2/) {
+ $Kolab::haschanged{'apache2'} = 1;
} elsif ($cfg =~ /proftpd/) {
$Kolab::haschanged{'proftpd'} = 1;
} elsif ($cfg =~ /openldap/) {
From cvs at kolab.org Tue Jul 17 17:09:36 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:09:36 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
freebusy.class.php.in, 1.13, 1.14
Message-ID: <20070717150936.0DF3860C4C6@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv14347/kolab-resource-handlers/kolab-resource-handlers/freebusy
Modified Files:
freebusy.class.php.in
Log Message:
add php5 compatibility code for domxml
(imported patch "php5-domxml-compat" from 2.2-beta1 release)
Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- freebusy.class.php.in 5 Jun 2007 09:46:49 -0000 1.13
+++ freebusy.class.php.in 17 Jul 2007 15:09:34 -0000 1.14
@@ -34,6 +34,9 @@
require_once '@kolab_php_module_prefix at freebusy/freebusyimapcache.class.php';
require_once '@kolab_php_module_prefix at freebusy/recurrence.class.php';
+if (version_compare(PHP_VERSION,'5', '>='))
+ require_once('@kolab_php_module_prefix at freebusy/domxml-php4-to-php5.php');
+
class FreeBusyRecurrence extends Recurrence {
function FreeBusyRecurrence( &$imapcache, &$imapuid, &$vfb, &$extra ) {
$this->imapcache =& $imapcache;
@@ -395,7 +398,7 @@
}
function getEventHash($xml_text) {
- $xmldoc = @domxml_open_mem($xml_text, DOMXML_LOAD_PARSING +
+ $xmldoc = domxml_open_mem($xml_text, DOMXML_LOAD_PARSING +
DOMXML_LOAD_COMPLETE_ATTRS + DOMXML_LOAD_SUBSTITUTE_ENTITIES +
DOMXML_LOAD_DONT_KEEP_BLANKS, $error);
From cvs at kolab.org Tue Jul 17 17:09:36 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:09:36 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
resmgr.php.in, 1.11, 1.12
Message-ID: <20070717150936.1222460C4C7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv14347/kolab-resource-handlers/kolab-resource-handlers/resmgr
Modified Files:
resmgr.php.in
Log Message:
add php5 compatibility code for domxml
(imported patch "php5-domxml-compat" from 2.2-beta1 release)
Index: resmgr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- resmgr.php.in 9 Nov 2006 17:53:24 -0000 1.11
+++ resmgr.php.in 17 Jul 2007 15:09:34 -0000 1.12
@@ -45,6 +45,9 @@
require_once 'Horde/Text.php';
require_once '@kolab_php_module_prefix at freebusy/recurrence.class.php';
+if (version_compare(PHP_VERSION,'5', '>='))
+ require_once('@kolab_php_module_prefix at freebusy/domxml-php4-to-php5.php');
+
// Globals
$imap = NULL;
$server = '';
From cvs at kolab.org Tue Jul 17 17:09:36 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:09:36 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers
Makefile.am, 1.10, 1.11
Message-ID: <20070717150936.0A1E660C4C5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers
In directory doto:/tmp/cvs-serv14347/kolab-resource-handlers/kolab-resource-handlers
Modified Files:
Makefile.am
Log Message:
add php5 compatibility code for domxml
(imported patch "php5-domxml-compat" from 2.2-beta1 release)
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am 21 Jun 2007 17:03:12 -0000 1.10
+++ Makefile.am 17 Jul 2007 15:09:34 -0000 1.11
@@ -16,6 +16,7 @@
freebusy_FILES = freebusy/misc.php \
+ freebusy/domxml-php4-to-php5.php \
freebusy/freebusycollector.class.php \
freebusy/freebusyldap.class.php \
freebusy/recurrence.class.php \
From cvs at kolab.org Tue Jul 17 17:26:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:26:07 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd Makefile.am,1.25,1.26
Message-ID: <20070717152607.43BEF600177@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv14844/kolabd/kolabd
Modified Files:
Makefile.am
Log Message:
Adapt kolabd templates for updated OpenPKG packages
(imported patch "current-templates" from 2.2-beta1 release)
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile.am 22 Jun 2007 00:31:07 -0000 1.25
+++ Makefile.am 17 Jul 2007 15:26:05 -0000 1.26
@@ -50,6 +50,7 @@
templates/freshclam.conf.template \
templates/httpd.conf.template \
templates/httpd.local.template \
+ templates/imapd.annotation_definitions.template \
templates/imapd.conf.template \
templates/imapd.group.template \
templates/kolab.conf.template \
@@ -373,6 +374,12 @@
$(do_subst) <$(srcdir)/templates/httpd.local.template.in >$@
CLEANFILES += templates/httpd.local.template
EXTRA_DIST += templates/httpd.local.template.in
+
+templates/imapd.annotation_definitions.template: templates/imapd.annotation_definitions.template.in
+ @$(mkinstalldirs) templates
+ $(do_subst) <$(srcdir)/templates/imapd.annotation_definitions.template.in >$@
+CLEANFILES += templates/imapd.annotation_definitions.template
+EXTRA_DIST += templates/imapd.annotation_definitions.template.in
templates/imapd.conf.template: templates/imapd.conf.template.in
@$(mkinstalldirs) templates
From cvs at kolab.org Tue Jul 17 17:26:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 17:26:07 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates httpd.conf.template.in, 1.8,
1.9 httpd.local.template.in, 1.1, 1.2 imapd.conf.template.in,
1.10, 1.11 master.cf.template.in, 1.14, 1.15 php.ini.template.in,
1.4, 1.5 rc.conf.template.in, 1.1, 1.2
Message-ID: <20070717152607.5198560C4C2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv14844/kolabd/kolabd/templates
Modified Files:
httpd.conf.template.in httpd.local.template.in
imapd.conf.template.in master.cf.template.in
php.ini.template.in rc.conf.template.in
Log Message:
Adapt kolabd templates for updated OpenPKG packages
(imported patch "current-templates" from 2.2-beta1 release)
Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- httpd.conf.template.in 5 Feb 2007 14:57:00 -0000 1.8
+++ httpd.conf.template.in 17 Jul 2007 15:26:05 -0000 1.9
@@ -1,5 +1,5 @@
KOLAB_META_START
-TARGET=@webserver_confdir@/apache.conf
+TARGET=@webserver_confdir@/apache2.conf
PERMISSIONS=0640
OWNERSHIP=@webserver_usr@:@webserver_grp@
KOLAB_META_END
@@ -82,7 +82,8 @@
MaxKeepAliveRequests 100
KeepAliveTimeout 15
-
+
+PidFile @webserver_pidfile@
StartServers 5
MinSpareServers 5
MaxSpareServers 10
@@ -90,16 +91,17 @@
MaxRequestsPerChild 0
-
+
StartServers 2
MaxClients 150
MinSpareThreads 25
MaxSpareThreads 75
ThreadsPerChild 25
MaxRequestsPerChild 0
+ServerLimit 16
-
+
NumServers 5
StartThreads 5
MinSpareThreads 5
@@ -160,9 +162,9 @@
# FIXME: not autoconfigured - still hardcoded
-TypesConfig etc/apache/mime.types
+TypesConfig etc/apache2/mime.types
DefaultType text/plain
-
+
MIMEMagicFile @webserver_confdir@/mime.magic
@@ -236,21 +238,17 @@
AuthType Basic
AuthName "Kolab Freebusy"
- LDAP_Server @@@ldap_ip@@@
- LDAP_Port @@@ldap_port@@@
- Base_DN "@@@base_dn@@@"
- # temporary : openldap changed from 2.1.9 to 2.1.12
- # anonymous bind with dn is nolonger allowed
- # unfortunately mod_auth_ldap seems to exactly do so
- # need to investigate ...
- Bind_DN "@@@php_dn@@@"
- Bind_Pass "@@@php_pw@@@"
- UID_Filter "(|(uid=%u)(mail=%u))"
+ AuthLDAPUrl "@@@ldap_uri@@@/@@@base_dn@@@?mail??"
+ AuthBasicAuthoritative off
+ AuthUserFile /dev/null
+ AuthBasicProvider ldap
+ AuthzLDAPAuthoritative off
+ AuthLDAPBindDN "@@@php_dn@@@"
+ AuthLDAPBindPassword "@@@php_pw@@@"
+ # FIXME: support authenticating with uid, too
@@@endif@@@
DavMinTimeout 600
AddDefaultCharset Off
- php_value include_path ".:@phplibdir2@:@phppeardir@:/php/include:@phplibdir@"
- #php_admin_flag safe_mode on
@@ -265,16 +263,14 @@
AuthType Basic
AuthName "Kolab Freebusy (webdav)"
- LDAP_Server @@@ldap_ip@@@
- LDAP_Port @@@ldap_port@@@
- Base_DN "@@@base_dn@@@"
- # temporary : openldap changed from 2.1.9 to 2.1.12
- # anonymous bind with dn is nolonger allowed
- # unfortunately mod_auth_ldap seems to exactly do so
- # need to investigate ...
- Bind_DN "@@@php_dn@@@"
- Bind_Pass "@@@php_pw@@@"
- UID_Filter "(|(uid=%u)(mail=%u))"
+ AuthLDAPUrl "@@@ldap_uri@@@/@@@base_dn@@@?mail??"
+ AuthBasicAuthoritative off
+ AuthUserFile /dev/null
+ AuthBasicProvider ldap
+ AuthzLDAPAuthoritative off
+ AuthLDAPBindDN "@@@php_dn@@@"
+ AuthLDAPBindPassword "@@@php_pw@@@"
+ # FIXME: support authenticating with uid, too
DavMinTimeout 600
AddDefaultCharset Off
@@ -282,7 +278,6 @@
AllowOverride All
Allow from all
- php_value include_path ".:@phplibdir2@:@phppeardir@:/php/include:@phplibdir@"
@@ -403,6 +398,7 @@
AddCharset EUC-KR .euc-kr
AddCharset shift_jis .sjis
+LoadModule php5_module @libexecdir@/apache2/libphp5.so
AddType application/x-tar .tgz
AddType application/x-httpd-php .php .php4 .php3 .html
AddType image/x-icon .ico
@@ -419,4 +415,4 @@
BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
# used for local non Kolab extension
-Include @webserver_confdir@/apache.local
+Include @webserver_confdir@/apache2.local
Index: httpd.local.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.local.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- httpd.local.template.in 13 Sep 2005 14:38:22 -0000 1.1
+++ httpd.local.template.in 17 Jul 2007 15:26:05 -0000 1.2
@@ -1,5 +1,5 @@
KOLAB_META_START
-TARGET=@webserver_confdir@/apache.local
+TARGET=@webserver_confdir@/apache2.local
PERMISSIONS=0640
OWNERSHIP=@webserver_musr@:@webserver_grp@
KOLAB_META_END
@@ -13,7 +13,7 @@
# The purpose of this file is to add local non Kolab specific extensions to
# the Apache installation. This file gets included at the end of the Apache
-# configuration file (apache.conf)
+# configuration file (apache2.conf)
# e.g.
# ScriptAlias /nagios/cgi-bin/ @libdir@/nagios/cgi/
Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- imapd.conf.template.in 10 Jan 2007 18:31:25 -0000 1.10
+++ imapd.conf.template.in 17 Jul 2007 15:26:05 -0000 1.11
@@ -91,3 +91,6 @@
# The minimum value is 1. A value of 0 will disable polling (and disable IDLE if polling is
# the only method available).
imapidlepoll: 5
+
+# Load definitions for vendor annotations
+annotation_definitions: /kolab/etc/imapd/imapd.annotation_definitions
Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- master.cf.template.in 26 Jun 2006 16:39:17 -0000 1.14
+++ master.cf.template.in 17 Jul 2007 15:26:05 -0000 1.15
@@ -35,11 +35,13 @@
relay unix - - n - - smtp -o fallback_relay=
showq unix n - n - - showq
error unix - - n - - error
+retry unix - - n - - error
local unix - n n - - local
#virtual unix - n n - - virtual
lmtp unix - - n - - lmtp
anvil unix - - n - 1 anvil
scache unix - - n - 1 scache
+#maildrop unix - n n - - pipe flags=DRhu user=vmail argv=@bindir@/maildrop -d ${recipient}
#cyrus unix - n n - - pipe user=cyrus argv=@bindir@/cyrdeliver -e -r ${sender} -m ${extension} ${user}
#uucp unix - n n - - pipe flags=Fqhu user=uucp argv=@bindir@/uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
#ifmail unix - n n - - pipe flags=F user=ftn argv=@bindir@/ifmail -r $nexthop ($recipient)
@@ -91,7 +93,7 @@
-o smtpd_hard_error_limit=1000
kolabpolicy unix - n n - - spawn user=@emailserver_master_usr@ argv=@kolab_scriptsdir@/kolab_smtpdpolicy
-kolabfilter unix - n n - - pipe user=@emailserver_master_usr@ flags=n argv=@PHP@
+kolabfilter unix - n n - - pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
-c @phpini_dir@/php.ini
-f @resmgr_scriptsdir@/kolabfilter.php
--
@@ -101,7 +103,7 @@
-c ${client_address}
-u ${sasl_username}
-kolabmailboxfilter unix - n n - - pipe user=@emailserver_master_usr@ flags=n argv=@PHP@
+kolabmailboxfilter unix - n n - - pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
-c @phpini_dir@/php.ini
-f @resmgr_scriptsdir@/kolabmailboxfilter.php
--
Index: php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- php.ini.template.in 28 Mar 2006 18:50:39 -0000 1.4
+++ php.ini.template.in 17 Jul 2007 15:26:05 -0000 1.5
@@ -3,903 +3,28 @@
PERMISSIONS=0640
OWNERSHIP=@webserver_musr@:@webserver_grp@
KOLAB_META_END
-[PHP]
-; (c) 2003 Tassilo Erlewein
-; (c) 2003 Martin Konold
-; This program is Free Software under the GNU General Public License (>=v2).
-; Read the file COPYING that comes with this packages for details.
-
-
-;;;;;;;;;;;;;;;;;;;
-; About this file ;
-;;;;;;;;;;;;;;;;;;;
-;
-; This is the recommended, PHP 4-style version of the php.ini-dist file. It
-; sets some non standard settings, that make PHP more efficient, more secure,
-; and encourage cleaner coding.
-; The price is that with these settings, PHP may be incompatible with some
-; applications, and sometimes, more difficult to develop with. Using this
-; file is warmly recommended for production sites. As all of the changes from
-; the standard settings are thoroughly documented, you can go over each one,
-; and decide whether you want to use it or not.
-;
-; For general information about the php.ini file, please consult the php.ini-dist
-; file, included in your PHP distribution.
-;
-; This file is different from the php.ini-dist file in the fact that it features
-; different values for several directives, in order to improve performance, while
-; possibly breaking compatibility with the standard out-of-the-box behavior of
-; PHP 3. Please make sure you read what's different, and modify your scripts
-; accordingly, if you decide to use this file instead.
-;
-; - register_globals = Off [Security, Performance]
-; Global variables are no longer registered for input data (POST, GET, cookies,
-; environment and other server variables). Instead of using $foo, you must use
-; you can use $_REQUEST["foo"] (includes any variable that arrives through the
-; request, namely, POST, GET and cookie variables), or use one of the specific
-; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending
-; on where the input originates. Also, you can look at the
-; import_request_variables() function.
-; Note that register_globals is going to be depracated (i.e., turned off by
-; default) in the next version of PHP, because it often leads to security bugs.
-; Read http://php.net/manual/en/security.registerglobals.php for further
-; information.
-; - display_errors = Off [Security]
-; With this directive set to off, errors that occur during the execution of
-; scripts will no longer be displayed as a part of the script output, and thus,
-; will no longer be exposed to remote users. With some errors, the error message
-; content may expose information about your script, web server, or database
-; server that may be exploitable for hacking. Production sites should have this
-; directive set to off.
-; - log_errors = On [Security]
-; This directive complements the above one. Any errors that occur during the
-; execution of your script will be logged (typically, to your server's error log,
-; but can be configured in several ways). Along with setting display_errors to off,
-; this setup gives you the ability to fully understand what may have gone wrong,
-; without exposing any sensitive information to remote users.
-; - output_buffering = 4096 [Performance]
-; Set a 4KB output buffer. Enabling output buffering typically results in less
-; writes, and sometimes less packets sent on the wire, which can often lead to
-; better performance. The gain this directive actually yields greatly depends
-; on which Web server you're working with, and what kind of scripts you're using.
-; - register_argc_argv = Off [Performance]
-; Disables registration of the somewhat redundant $argv and $argc global
-; variables.
-; - magic_quotes_gpc = Off [Performance]
-; Input data is no longer escaped with slashes so that it can be sent into
-; SQL databases without further manipulation. Instead, you should use the
-; function addslashes() on each input element you wish to send to a database.
-; - variables_order = "GPCS" [Performance]
-; The environment variables are not hashed into the $HTTP_ENV_VARS[]. To access
-; environment variables, you can use getenv() instead.
-; - error_reporting = E_ALL [Code Cleanliness, Security(?)]
-; By default, PHP surpresses errors of type E_NOTICE. These error messages
-; are emitted for non-critical errors, but that could be a symptom of a bigger
-; problem. Most notably, this will cause error messages about the use
-; of uninitialized variables to be displayed.
-; - allow_call_time_pass_reference = Off [Code cleanliness]
-; It's not possible to decide to force a variable to be passed by reference
-; when calling a function. The PHP 4 style to do this is by making the
-; function require the relevant argument by reference.
-
-
-;;;;;;;;;;;;;;;;;;;;
-; Language Options ;
-;;;;;;;;;;;;;;;;;;;;
-
-; Enable the PHP scripting language engine under Apache.
-engine = On
-
-; Allow the tag. Otherwise, only tags are recognized.
-short_open_tag = Off
-
-; Allow ASP-style <% %> tags.
-asp_tags = Off
-
-; The number of significant digits displayed in floating point numbers.
-precision = 14
-
-; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
-y2k_compliance = Off
-
-; Output buffering allows you to send header lines (including cookies) even
-; after you send body content, at the price of slowing PHP's output layer a
-; bit. You can enable output buffering during runtime by calling the output
-; buffering functions. You can also enable output buffering for all files by
-; setting this directive to On. If you wish to limit the size of the buffer
-; to a certain size - you can use a maximum number of bytes instead of 'On', as
-; a value for this directive (e.g., output_buffering=4096).
-output_buffering = 4096
-
-; You can redirect all of the output of your scripts to a function. For
-; example, if you set output_handler to "ob_gzhandler", output will be
-; transparently compressed for browsers that support gzip or deflate encoding.
-; Setting an output handler automatically turns on output buffering.
-output_handler =
-
-; Transparent output compression using the zlib library
-; Valid values for this option are 'off', 'on', or a specific buffer size
-; to be used for compression (default is 4KB)
-;
-; Note: output_handler must be empty if this is set 'On' !!!!
-;
-zlib.output_compression = Off
-
-; Implicit flush tells PHP to tell the output layer to flush itself
-; automatically after every output block. This is equivalent to calling the
-; PHP function flush() after each and every call to print() or echo() and each
-; and every HTML block. Turning this option on has serious performance
-; implications and is generally recommended for debugging purposes only.
-implicit_flush = Off
-
-; Whether to enable the ability to force arguments to be passed by reference
-; at function call time. This method is deprecated and is likely to be
-; unsupported in future versions of PHP/Zend. The encouraged method of
-; specifying which arguments should be passed by reference is in the function
-; declaration. You're encouraged to try and turn this option Off and make
-; sure your scripts work properly with it in order to ensure they will work
-; with future versions of the language (you will receive a warning each time
-; you use this feature, and the argument will be passed by value instead of by
-; reference).
-allow_call_time_pass_reference = Off
-
-;
-; Safe Mode
-;
-safe_mode = Off
-
-; By default, Safe Mode does a UID compare check when
-; opening files. If you want to relax this to a GID compare,
-; then turn on safe_mode_gid.
-safe_mode_gid = Off
-
-; When safe_mode is on, UID/GID checks are bypassed when
-; including files from this directory and its subdirectories.
-; (directory must also be in include_path or full path must
-; be used when including)
-safe_mode_include_dir =
-
-; When safe_mode is on, only executables located in the safe_mode_exec_dir
-; will be allowed to be executed via the exec family of functions.
-safe_mode_exec_dir =
-
-; open_basedir, if set, limits all file operations to the defined directory
-; and below. This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file.
-;
-;open_basedir =
-
-; Setting certain environment variables may be a potential security breach.
-; This directive contains a comma-delimited list of prefixes. In Safe Mode,
-; the user may only alter environment variables whose names begin with the
-; prefixes supplied here. By default, users will only be able to set
-; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR).
-;
-; Note: If this directive is empty, PHP will let the user modify ANY
-; environment variable!
-safe_mode_allowed_env_vars = PHP_
-
-; This directive contains a comma-delimited list of environment variables that
-; the end user won't be able to change using putenv(). These variables will be
-; protected even if safe_mode_allowed_env_vars is set to allow to change them.
-safe_mode_protected_env_vars = LD_LIBRARY_PATH
-
-; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-disable_functions =
-
-; Colors for Syntax Highlighting mode. Anything that's acceptable in
-; would work.
-highlight.string = #CC0000
-highlight.comment = #FF9900
-highlight.keyword = #006600
-highlight.bg = #FFFFFF
-highlight.default = #0000CC
-highlight.html = #000000
-
-
-;
-; Misc
-;
-; Decides whether PHP may expose the fact that it is installed on the server
-; (e.g. by adding its signature to the Web server header). It is no security
-; threat in any way, but it makes it possible to determine whether you use PHP
-; on your server or not.
-expose_php = On
-
-
-;;;;;;;;;;;;;;;;;;;
-; Resource Limits ;
-;;;;;;;;;;;;;;;;;;;
-
-max_execution_time = 120 ; Maximum execution time of each script, in seconds
-memory_limit = 16M ; Maximum amount of memory a script may consume (8MB)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Error handling and logging ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; error_reporting is a bit-field. Or each number up to get desired error
-; reporting level
-; E_ALL - All errors and warnings
-; E_ERROR - fatal run-time errors
-; E_WARNING - run-time warnings (non-fatal errors)
-; E_PARSE - compile-time parse errors
-; E_NOTICE - run-time notices (these are warnings which often result
-; from a bug in your code, but it's possible that it was
-; intentional (e.g., using an uninitialized variable and
-; relying on the fact it's automatically initialized to an
-; empty string)
-; E_CORE_ERROR - fatal errors that occur during PHP's initial startup
-; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's
-; initial startup
-; E_COMPILE_ERROR - fatal compile-time errors
-; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
-; E_USER_ERROR - user-generated error message
-; E_USER_WARNING - user-generated warning message
-; E_USER_NOTICE - user-generated notice message
-;
-; Examples:
-;
-; - Show all errors, except for notices
-;
-error_reporting = E_ALL & ~E_NOTICE
-;
-; - Show only errors
-;
-;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
-;
-; - Show all errors
-;
-;error_reporting = E_ALL
-
-; Print out errors (as a part of the output). For production web sites,
-; you're strongly encouraged to turn this feature off, and use error logging
-; instead (see below). Keeping display_errors enabled on a production web site
-; may reveal security information to end users, such as file paths on your Web
-; server, your database schema or other information.
-display_errors = Off
-
-; Even when display_errors is on, errors that occur during PHP's startup
-; sequence are not displayed. It's strongly recommended to keep
-; display_startup_errors off, except for when debugging.
-display_startup_errors = Off
-
-; Log errors into a log file (server-specific log, stderr, or error_log (below))
-; As stated above, you're strongly advised to use error logging in place of
-; error displaying on production web sites.
-log_errors = On
-
-; Store the last error/warning message in $php_errormsg (boolean).
-track_errors = Off
-
-; Disable the inclusion of HTML tags in error messages.
-;html_errors = Off
-
-; String to output before an error message.
-;error_prepend_string = ""
-
-; String to output after an error message.
-;error_append_string = " "
-
-; Log errors to specified file.
-;error_log = filename
-
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
-;error_log = syslog
-
-
-;;;;;;;;;;;;;;;;;
-; Data Handling ;
-;;;;;;;;;;;;;;;;;
-;
-; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
-
-; The separator used in PHP generated URLs to separate arguments.
-; Default is "&".
-;arg_separator.output = "&"
-
-; List of separator(s) used by PHP to parse input URLs into variables.
-; Default is "&".
-; NOTE: Every character in this directive is considered as separator!
-;arg_separator.input = ";&"
-
-; This directive describes the order in which PHP registers GET, POST, Cookie,
-; Environment and Built-in variables (G, P, C, E & S respectively, often
-; referred to as EGPCS or GPC). Registration is done from left to right, newer
-; values override older values.
-variables_order = "GPCS"
-
-; Whether or not to register the EGPCS variables as global variables. You may
-; want to turn this off if you don't want to clutter your scripts' global scope
-; with user data. This makes most sense when coupled with track_vars - in which
-; case you can access all of the GPC variables through the $HTTP_*_VARS[],
-; variables.
-;
-; You should do your best to write your scripts so that they do not require
-; register_globals to be on; Using form variables as globals can easily lead
-; to possible security problems, if the code is not very well thought of.
-register_globals = Off
-
-; This directive tells PHP whether to declare the argv&argc variables (that
-; would contain the GET information). If you don't use these variables, you
-; should turn it off for increased performance.
-register_argc_argv = Off
-
-; Maximum size of POST data that PHP will accept.
-post_max_size = 8M
-
-; This directive is deprecated. Use variables_order instead.
-gpc_order = "GPC"
-
-; Magic quotes
-;
-
-; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = Off
-
-; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-magic_quotes_runtime = Off
-
-; Use Sybase-style magic quotes (escape ' with '' instead of \').
-magic_quotes_sybase = Off
-
-; Automatically add files before or after any PHP document.
-auto_prepend_file =
-auto_append_file =
-
-; As of 4.0b4, PHP always outputs a character encoding by default in
-; the Content-type: header. To disable sending of the charset, simply
-; set it to be empty.
-;
-; PHP's built-in default is text/html
-default_mimetype = "text/html"
-;default_charset = "iso-8859-1"
-
-; Always populate the $HTTP_RAW_POST_DATA variable.
-;always_populate_raw_post_data = On
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; Paths and Directories ;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-include_path = ".:/php/include:@phplibdir@:@phplibdir2@:@phppeardir@"
-
-; The root of the PHP pages, used only if nonempty.
-; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-; if you are running php as a CGI under any web server (other than IIS)
-; see documentation for security issues. The alternate is to use the
-; cgi.force_redirect configuration below
-doc_root =
-
-; The directory under which PHP opens the script using /~usernamem used only
-; if nonempty.
-user_dir =
-
-; Directory in which the loadable extensions (modules) reside.
-extension_dir = ./
-
-; Whether or not to enable the dl() function. The dl() function does NOT work
-; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-; disabled on them.
-enable_dl = On
-
-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-; most web servers. Left undefined, PHP turns this on by default. You can
-; turn it off here AT YOUR OWN RISK
-; **You CAN safely turn this off for IIS, in fact, you MUST.**
-; cgi.force_redirect = 1
-
-; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
-; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
-; will look for to know it is OK to continue execution. Setting this variable MAY
-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; cgi.redirect_status_env = ;
-
-
-
-;;;;;;;;;;;;;;;;
-; File Uploads ;
-;;;;;;;;;;;;;;;;
-
-; Whether to allow HTTP file uploads.
-file_uploads = On
-
-; Temporary directory for HTTP uploaded files (will use system default if not
-; specified).
-;upload_tmp_dir =
-
-; Maximum allowed size for uploaded files.
-upload_max_filesize = 2M
-
-
-;;;;;;;;;;;;;;;;;;
-; Fopen wrappers ;
-;;;;;;;;;;;;;;;;;;
-
-; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
-
-; Define the anonymous ftp password (your email address)
-;from="john at doe.com"
-
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-; extension=modulename.extension
-;
-; For example, on Windows:
-;
-; extension=msql.dll
-;
-; ... or under UNIX:
-;
-; extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information
-; needs to go here. Specify the location of the extension with the
-; extension_dir directive above.
-
-
-;Windows Extensions
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
-;
-;extension=php_bz2.dll
-;extension=php_ctype.dll
-;extension=php_cpdf.dll
-;extension=php_curl.dll
-;extension=php_cybercash.dll
-;extension=php_db.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_dbx.dll
-;extension=php_domxml.dll
-;extension=php_dotnet.dll
-;extension=php_exif.dll
-;extension=php_fbsql.dll
-;extension=php_fdf.dll
-;extension=php_filepro.dll
-;extension=php_gd.dll
-;extension=php_gettext.dll
-;extension=php_hyperwave.dll
-;extension=php_iconv.dll
-;extension=php_ifx.dll
-;extension=php_iisfunc.dll
-;extension=php_imap.dll
-;extension=php_ingres.dll
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_ming.dll
-;extension=php_mssql.dll
-;extension=php_oci8.dll
-;extension=php_openssl.dll
-;extension=php_oracle.dll
-;extension=php_pdf.dll
-;extension=php_pgsql.dll
-;extension=php_printer.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_sockets.dll
-;extension=php_sybase_ct.dll
-;extension=php_tokenizer.dll
-;extension=php_w32api.dll
-;extension=php_xslt.dll
-;extension=php_yaz.dll
-;extension=php_zlib.dll
-
-
-;;;;;;;;;;;;;;;;;;;
-; Module Settings ;
-;;;;;;;;;;;;;;;;;;;
-
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
-; runtime, you can define these variables by calling define_syslog_variables().
-define_syslog_variables = Off
-
-[mail function]
-; For Win32 only.
-SMTP = localhost
-
-; For Win32 only.
-sendmail_from = me at localhost.com
-
-; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
-;sendmail_path =
-
-[Java]
-;java.class.path = .\php_java.jar
-;java.home = c:\jdk
-;java.library = c:\jdk\jre\bin\hotspot\jvm.dll
-;java.library.path = .\
-
-[SQL]
-sql.safe_mode = Off
-
-[ODBC]
-;odbc.default_db = Not yet implemented
-;odbc.default_user = Not yet implemented
-;odbc.default_pw = Not yet implemented
-
-; Allow or prevent persistent links.
-odbc.allow_persistent = On
-
-; Check that a connection is still valid before reuse.
-odbc.check_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-odbc.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-odbc.max_links = -1
-
-; Handling of LONG fields. Returns number of bytes to variables. 0 means
-; passthru.
-odbc.defaultlrl = 4096
-
-; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char.
-; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
-; of uodbc.defaultlrl and uodbc.defaultbinmode
-odbc.defaultbinmode = 1
-
-[MySQL]
-; Allow or prevent persistent links.
-mysql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-mysql.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-mysql.max_links = -1
-
-; Default port number for mysql_connect(). If unset, mysql_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
-; at MYSQL_PORT.
-mysql.default_port =
-
-; Default socket name for local MySQL connects. If empty, uses the built-in
-; MySQL defaults.
-mysql.default_socket =
-
-; Default host for mysql_connect() (doesn't apply in safe mode).
-mysql.default_host =
-
-; Default user for mysql_connect() (doesn't apply in safe mode).
-mysql.default_user =
-
-; Default password for mysql_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo cfg_get_var("mysql.default_password")
-; and reveal this password! And of course, any users with read access to this
-; file will be able to reveal the password as well.
-mysql.default_password =
-
-[mSQL]
-; Allow or prevent persistent links.
-msql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-msql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-msql.max_links = -1
-
-[PostgresSQL]
-; Allow or prevent persistent links.
-pgsql.allow_persistent = On
-
-; Detect broken persistent links always with pg_pconnect(). Need a little overhead.
-pgsql.auto_reset_persistent = Off
-
-; Maximum number of persistent links. -1 means no limit.
-pgsql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-pgsql.max_links = -1
-
-[Sybase]
-; Allow or prevent persistent links.
-sybase.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-sybase.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-sybase.max_links = -1
-
-;sybase.interface_file = "@prefix@/sybase/interfaces"
-
-; Minimum error severity to display.
-sybase.min_error_severity = 10
-
-; Minimum message severity to display.
-sybase.min_message_severity = 10
-
-; Compatability mode with old versions of PHP 3.0.
-; If on, this will cause PHP to automatically assign types to results according
-; to their Sybase type, instead of treating them all as strings. This
-; compatability mode will probably not stay around forever, so try applying
-; whatever necessary changes to your code, and turn it off.
-sybase.compatability_mode = Off
-
-[Sybase-CT]
-; Allow or prevent persistent links.
-sybct.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-sybct.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-sybct.max_links = -1
-
-; Minimum server message severity to display.
-sybct.min_server_severity = 10
-
-; Minimum client message severity to display.
-sybct.min_client_severity = 10
-
-[bcmath]
-; Number of decimal digits for all bcmath functions.
-bcmath.scale = 0
-
-[browscap]
-;browscap = extra/browscap.ini
-
-[Informix]
-; Default host for ifx_connect() (doesn't apply in safe mode).
-ifx.default_host =
-
-; Default user for ifx_connect() (doesn't apply in safe mode).
-ifx.default_user =
-
-; Default password for ifx_connect() (doesn't apply in safe mode).
-ifx.default_password =
-
-; Allow or prevent persistent links.
-ifx.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-ifx.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent). -1 means no limit.
-ifx.max_links = -1
-
-; If on, select statements return the contents of a text blob instead of its id.
-ifx.textasvarchar = 0
-
-; If on, select statements return the contents of a byte blob instead of its id.
-ifx.byteasvarchar = 0
+;;
+;; php.ini -- PHP Configuration
+;;
-; Trailing blanks are stripped from fixed-length char columns. May help the
-; life of Informix SE users.
-ifx.charasvarchar = 0
+[PHP]
-; If on, the contents of text and byte blobs are dumped to a file instead of
-; keeping them in memory.
-ifx.blobinfile = 0
+; Resource Limits
+register_globals = off ; Global variables are no longer registered for input data
+safe_mode = off ; Enable Safe Mode (file UID comparisons)
+safe_mode_gid = off ; Whether to relax Safe Mode to file GID comparisons
+allow_url_fopen = on ; Disable the opening of remote URLs
+display_errors = off ; Errors will NOT be displayed
+log_errors = on ; Errors will be logged
+max_execution_time = 120 ; Maximum execution time of each script, in seconds
+max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
+memory_limit = 16M ; Maximum amount of memory a script may consume
+post_max_size = 8M ; Maximum amount of POST data accepted
-; NULL's are returned as empty strings, unless this is set to 1. In that case,
-; NULL's are returned as string 'NULL'.
-ifx.nullformat = 0
+; Include Paths
+;include_path = ".:/kolab/lib/php"
+include_path = ".:@phplibdir@:@phplibdir2@:@phppeardir@"
+safe_mode_include_dir = "/kolab/lib/php"
[Session]
-; Handler used to store/retrieve data.
-session.save_handler = files
-
-; Argument passed to save_handler. In the case of files, this is the path
-; where data files are stored. Note: Windows users have to change this
-; variable in order to use PHP's session functions.
session.save_path = @webserver_sessions@
-
-; Whether to use cookies.
-session.use_cookies = 1
-
-
-; Name of the session (used as cookie name).
-session.name = PHPSESSID
-
-; Initialize session on request startup.
-session.auto_start = 0
-
-; Lifetime in seconds of cookie or, if 0, until browser is restarted.
-session.cookie_lifetime = 0
-
-; The path for which the cookie is valid.
-session.cookie_path = /
-
-; The domain for which the cookie is valid.
-session.cookie_domain =
-
-; Handler used to serialize data. php is the standard serializer of PHP.
-session.serialize_handler = php
-
-; Percentual probability that the 'garbage collection' process is started
-; on every session initialization.
-session.gc_probability = 1
-
-; After this number of seconds, stored data will be seen as 'garbage' and
-; cleaned up by the garbage collection process.
-session.gc_maxlifetime = 1440
-
-; Check HTTP Referer to invalidate externally stored URLs containing ids.
-; HTTP_REFERER has to contain this substring for the session to be
-; considered as valid.
-session.referer_check =
-
-; How many bytes to read from the file.
-session.entropy_length = 0
-
-; Specified here to create the session id.
-session.entropy_file =
-
-;session.entropy_length = 16
-
-;session.entropy_file = /dev/urandom
-
-; Set to {nocache,private,public} to determine HTTP caching aspects.
-session.cache_limiter = nocache
-
-; Document expires after n minutes.
-session.cache_expire = 180
-
-; trans sid support is disabled by default.
-; Use of trans sid may risk your users security.
-; Use this option with caution.
-; - User may send URL contains active session ID
-; to other person via. email/irc/etc.
-; - URL that contains active session ID may be stored
-; in publically accessible computer.
-; - User may access your site with the same session ID
-; always using URL stored in browser's history or bookmarks.
-session.use_trans_sid = On
-
-url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
-
-[MSSQL]
-; Allow or prevent persistent links.
-mssql.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-mssql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent). -1 means no limit.
-mssql.max_links = -1
-
-; Minimum error severity to display.
-mssql.min_error_severity = 10
-
-; Minimum message severity to display.
-mssql.min_message_severity = 10
-
-; Compatability mode with old versions of PHP 3.0.
-mssql.compatability_mode = Off
-
-; Valid range 0 - 2147483647. Default = 4096.
-;mssql.textlimit = 4096
-
-; Valid range 0 - 2147483647. Default = 4096.
-;mssql.textsize = 4096
-
-; Limits the number of records in each batch. 0 = all records in one batch.
-;mssql.batchsize = 0
-
-[Assertion]
-; Assert(expr); active by default.
-;assert.active = On
-
-; Issue a PHP warning for each failed assertion.
-;assert.warning = On
-
-; Don't bail out by default.
-;assert.bail = Off
-
-; User-function to be called if an assertion fails.
-;assert.callback = 0
-
-; Eval the expression with current error_reporting(). Set to true if you want
-; error_reporting(0) around the eval().
-;assert.quiet_eval = 0
-
-[Ingres II]
-; Allow or prevent persistent links.
-ingres.allow_persistent = On
-
-; Maximum number of persistent links. -1 means no limit.
-ingres.max_persistent = -1
-
-; Maximum number of links, including persistents. -1 means no limit.
-ingres.max_links = -1
-
-; Default database (format: [node_id::]dbname[/srv_class]).
-ingres.default_database =
-
-; Default user.
-ingres.default_user =
-
-; Default password.
-ingres.default_password =
-
-[Verisign Payflow Pro]
-; Default Payflow Pro server.
-pfpro.defaulthost = "test-payflow.verisign.com"
-
-; Default port to connect to.
-pfpro.defaultport = 443
-
-; Default timeout in seconds.
-pfpro.defaulttimeout = 30
-
-; Default proxy IP address (if required).
-;pfpro.proxyaddress =
-
-; Default proxy port.
-;pfpro.proxyport =
-
-; Default proxy logon.
-;pfpro.proxylogon =
-
-; Default proxy password.
-;pfpro.proxypassword =
-
-[Sockets]
-; Use the system read() function instead of the php_read() wrapper.
-sockets.use_system_read = On
-
-[com]
-; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-;com.typelib_file =
-; allow Distributed-COM calls
-;com.allow_dcom = true
-; autoregister constants of a components typlib on com_load()
-;com.autoregister_typelib = true
-; register constants casesensitive
-;com.autoregister_casesensitive = false
-; show warnings on duplicate constat registrations
-;com.autoregister_verbose = true
-
-[Printer]
-;printer.default_printer = ""
-
-[mbstring]
-;mbstring.internal_encoding = EUC-JP
-;mbstring.http_input = auto
-;mbstring.http_output = SJIS
-;mbstring.detect_order = auto
-;mbstring.substitute_character = none;
-
-[FrontBase]
-;fbsql.allow_persistent = On
-;fbsql.autocommit = On
-;fbsql.default_database =
-;fbsql.default_database_password =
-;fbsql.default_host =
-;fbsql.default_password =
-;fbsql.default_user = "_SYSTEM"
-;fbsql.generate_warnings = Off
-;fbsql.max_connections = 128
-;fbsql.max_links = 128
-;fbsql.max_persistent = -1
-;fbsql.max_results = 128
-;fbsql.batchSize = 1000
-
-; Local Variables:
-; tab-width: 4
-; End:
Index: rc.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/rc.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rc.conf.template.in 13 Sep 2005 14:38:22 -0000 1.1
+++ rc.conf.template.in 17 Jul 2007 15:26:05 -0000 1.2
@@ -11,12 +11,6 @@
# this file is automatically written by the Kolab config backend
# manual additions are lost unless made to the template in the Kolab config directory
-# Logfile corrections
-apache_log_files="@webserver_accesslogfile@"
-apache_err_files="@webserver_errorlogfile@"
-imapd_master_file="@imap_masterlogfile@"
-imapd_misc_file="@imap_misclogfile@"
-
openldap_url="ldap:// ldaps://"
sasl_authmech="ldap"
From cvs at kolab.org Tue Jul 17 18:30:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 18:30:55 +0200 (CEST)
Subject: thomas: server 00INDEX.rdf, NONE, 1.1 LIESMICH.txt, NONE,
1.1 install-kolab.sh, NONE, 1.1
Message-ID: <20070717163055.6F7C560C4C7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv16774
Added Files:
00INDEX.rdf LIESMICH.txt install-kolab.sh
Log Message:
Added 00INDEX.rdf, LIESMICH.txt and install-kolab.sh from 2.2-beta1 release.
These will probably be not very useful in the long run, but having them in
the history is important.
--- NEW FILE: 00INDEX.rdf ---
mm
1.4.2
20061013
OpenPKG Community
BASE
Libraries
BSD
OpenPKG Foundation e.V.
Shared Memory Allocation Library
http://www.ossp.org/pkg/lib/mm/
Ralf S. Engelschall
OpenPKG
[...5854 lines suppressed...]
php::with_pear
kolabd
kolab-horde-framework
kolab-resource-handlers-2.1.99.tar.bz2
Blah blah
--- NEW FILE: LIESMICH.txt ---
Kolab Server 2.2-beta1
=======================
Diese Entwicklungsversion des Kolab-Servers demonstriert die
Integration der Kolab-Komponenten in eine aktuelle Systemumgebung.
Sie basiert auf OpenPKG-CURRENT und Kolab-CVS vom 8. Juni 2007.
Ein produktiver Einsatz wird nicht empfohlen.
Installation
------------
Die Pakete in den Verzeichnissen "sources" und "ix86-debian4.0" lassen
sich mit dem enthaltenen "install-kolab.sh"-Skript installieren.
Installation der Quellcodepakete (als root):
# cd sources
# ./install-kolab.sh openpkg-20070606-20070606.src.sh
Installation der ix86-Binärpakete für Debian GNU/Linux 4.0 (etch):
# cd ix86-debian4.0
# ./install-kolab.sh openpkg-20070606-20070606.ix86-debian4.0-kolab.sh
Das aktuelle Verzeichnis muss schreibbar sein, ggf. kann man das Skript
mit vollständigen Pfaden aufzufen, z.B. auf einer CD-ROM:
# /media/cdrom/server/sources/install-kolab.sh \
/media/cdrom/server/sources/openpkg-20070606-20070606.src.sh
oder
# /media/cdrom/server/ix86-debian4.0/install-kolab.sh \
/media/cdrom/server/ix86-debian4.0/openpkg-*.sh
Konfiguration
-------------
Nach der Installation sollte die initiale Konfiguration des Servers
durchgeführt werden:
# /kolab/etc/kolab/kolab_bootstrap -b
Upgrades von früheren Kolab-Server-Versionen können entsprechend der
mit dem Server 2.1.0 veröffentlichten Anleitung durchgeführt werden.
Patches
-------
Die Patches im Verzeichnis "patches" wurden verwendet, um diese
Zusammenstellung zu erstellen. Für die Inbetriebnahme des Server müssen
sie nicht weiter beachtet werden, da alles notwendige in den
rpm-Dateien enthalten ist.
Diese Patches werden in das zentrale Kolab-CVS-Repository eingespielt,
sobald die Entwicklungszweige des Kolab-Servers 2.1 und 2.2 in
getrennte Branches aufgeteilt werden.
Bekannte Probleme
-----------------
Es wurde nicht das aktuelle openldap-Paket aus OpenPKG-CURRENT verwendet,
sondern das Paket aus Kolab-Server 2.1.0, da das aktuelle Paket einen Fehler
aufweist, der den erfolgreich Ablauf von kolab_bootstrap verhindert.
Ansonsten gelten derzeit noch die Hinweise aus "Known problems and
workarounds" aus dem README des Kolab-Servers 2.1.0:
Known problems and workarounds
------------------------------
- Your system (C library) has to support all languages you want to have
available in the web admin interface and fbview. For most languages you
have to use the non-UTF-8 and non-euro locales, i.e. de_DE, fr_FR,
it_IT, nl_NL instead of e.g. de_DE at euro. For fbview some languages need
a UTF-8 locale, e.g. ja_JP.UTF-8 for Japanese.
See kolab/issue881 and kolab/issue1585 for details.
- 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
bootstrap. In that case restart the kolabd:
/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.
- If modifying or deleting of address book entries doesn't work,
restarting openldap can help, see kolab/issue854 for details.
- There is a report that the manager can only see users in the primary
domain, see kolab/issue1485. We can't reproduce this problem, please
tell us if you can.
- Calendar folders for group/resource accounts can't be created for
domains which were added after bootstrap, i.e. via the web admin
interface. See kolab/issue1313 for details.
- When deleting domains via the web admin interface, the corresponding
LDAP data and IMAP spool stay on the server and have to be deleted
manually. See kolab/issue1571 and kolab/issue1576 for details.
--- NEW FILE: install-kolab.sh ---
#!/bin/sh
KOLAB_VERSION="2.2-beta1"
PREFIX="/kolab"
TAG="kolab"
usage() {
echo "Usage:"
echo " $0 directory/openpkg-*-*.src.sh"
echo " $0 directory/openpkg-*-*.ix86-debian4.0.sh"
echo " $0 directory"
exit 1
}
[ $# -ne 1 ] && usage
if echo "$1" | grep '\.src\.sh$' >/dev/null; then
# install from source
SRC="$1"
PLATTAG=`sh "$1" -t | tar xf - -O shtool | sh -s platform --type=binary`-$TAG
BIN=`basename "$1" .src.sh`.$PLATTAG.sh
DIR=`dirname "$SRC"`
elif echo "$1" | grep 'openpkg-.*\.sh$' >/dev/null; then
# install from binary
SRC=""
BIN="$1"
DIR=`dirname "$BIN"`
elif [ -d "$PREFIX/etc/openpkg" ]; then
# upgrade
SRC=""
BIN=""
DIR="$1"
fi
DIR=`cd $DIR; pwd`
if [ -n "$SRC" ]; then
sh "$SRC" \
--prefix="$PREFIX" \
--tag="$TAG" --user="kolab" --group="kolab" \
--muid="19414" --ruid="19415" --nuid="19416" \
--mgid="19414" --rgid="19415" --ngid="19416" \
|| exit $?
fi
if [ -n "$BIN" ]; then
sh "$BIN" || exit $?
fi
if [ -n "$DIR" ]; then
[ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG
if [ -n "$KOLAB_VERSION" ]; then
DEFINE="
-Dkolabd::kolab_version=$KOLAB_VERSION
-Dkolab-webadmin::kolab_version=$KOLAB_VERSION
"
fi
"$PREFIX/bin/openpkg" build -kK -r "$DIR" -p "$PLATTAG" $DEFINE \
openpkg-tools kolabd kolab-webadmin kolab-resource-handlers kolab-horde-fbview | sh \
|| exit $?
fi
exit 0
From cvs at kolab.org Tue Jul 17 18:39:36 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 18:39:36 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
domxml-php4-to-php5.php, NONE, 1.1
Message-ID: <20070717163936.B6A6060C4C7@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv17004/kolab-resource-handlers/kolab-resource-handlers/freebusy
Added Files:
domxml-php4-to-php5.php
Log Message:
Add forgotten new files from Kolab 2.2-beta1 release.
--- NEW FILE: domxml-php4-to-php5.php ---
=5.1/libxml for error reports)
Typical use:
{
if (version_compare(PHP_VERSION,'5','>='))
require_once('domxml-php4-to-php5.php');
}
Version 1.17, 2007-06-05, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
------------------------------------------------------------------
Written by Alexandre Alapetite, http://alexandre.alapetite.net/cv/
Copyright 2004-2007, Licence: Creative Commons "Attribution-ShareAlike 2.0 France" BY-SA (FR),
http://creativecommons.org/licenses/by-sa/2.0/fr/
http://alexandre.alapetite.net/divers/apropos/#by-sa
- Attribution. You must give the original author credit
- Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one
(Can be included in GPL/LGPL projects)
- The French law is authoritative
- Any of these conditions can be waived if you get permission from Alexandre Alapetite
- Please send to Alexandre Alapetite the modifications you make,
in order to improve this file for the benefit of everybody
If you want to distribute this code, please do it as a link to:
http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
*/
define('DOMXML_LOAD_PARSING',0);
define('DOMXML_LOAD_VALIDATING',1);
define('DOMXML_LOAD_RECOVERING',2);
define('DOMXML_LOAD_SUBSTITUTE_ENTITIES',4);
//define('DOMXML_LOAD_COMPLETE_ATTRS',8);
define('DOMXML_LOAD_DONT_KEEP_BLANKS',16);
function domxml_new_doc($version) {return new php4DOMDocument();}
function domxml_new_xmldoc($version) {return new php4DOMDocument();}
function domxml_open_file($filename,$mode=DOMXML_LOAD_PARSING,&$error=null)
{
$dom=new php4DOMDocument($mode);
$errorMode=(func_num_args()>2);
if ($errorMode) libxml_use_internal_errors(true);
if (!$dom->myDOMNode->load($filename)) $dom=null;
if ($errorMode)
{
$error=array_map('_error_report',libxml_get_errors());
libxml_clear_errors();
}
return $dom;
}
function domxml_open_mem($str,$mode=DOMXML_LOAD_PARSING,&$error=null)
{
$dom=new php4DOMDocument($mode);
$errorMode=(func_num_args()>2);
if ($errorMode) libxml_use_internal_errors(true);
if (!$dom->myDOMNode->loadXML($str)) $dom=null;
if ($errorMode)
{
$error=array_map('_error_report',libxml_get_errors());
libxml_clear_errors();
}
return $dom;
}
function html_doc($html_doc,$from_file=false)
{
$dom=new php4DOMDocument();
if ($from_file) $result=$dom->myDOMNode->loadHTMLFile($html_doc);
else $result=$dom->myDOMNode->loadHTML($html_doc);
return $result ? $dom : null;
}
function html_doc_file($filename) {return html_doc($filename,true);}
function xmldoc($str) {return domxml_open_mem($str);}
function xmldocfile($filename) {return domxml_open_file($filename);}
function xpath_eval($xpath_context,$eval_str,$contextnode=null) {return $xpath_context->xpath_eval($eval_str,$contextnode);}
function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document);}
function xpath_register_ns($xpath_context,$prefix,$namespaceURI) {return $xpath_context->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
function _error_report($error) {return array('errormessage'=>$error->message,'nodename'=>'','line'=>$error->line,'col'=>$error->column)+($error->file==''?array():array('directory'=>dirname($error->file),'file'=>basename($error->file)));}
class php4DOMAttr extends php4DOMNode
{
function name() {return $this->myDOMNode->name;}
function set_value($content) {return $this->myDOMNode->value=$content;}
function specified() {return $this->myDOMNode->specified;}
function value() {return $this->myDOMNode->value;}
}
class php4DOMDocument extends php4DOMNode
{
function php4DOMDocument($mode=DOMXML_LOAD_PARSING)
{
$this->myDOMNode=new DOMDocument();
$this->myOwnerDocument=$this;
if ($mode & DOMXML_LOAD_VALIDATING) $dom->myDOMNode->validateOnParse=true;
if ($mode & DOMXML_LOAD_RECOVERING) $dom->myDOMNode->recover=true;
if ($mode & DOMXML_LOAD_SUBSTITUTE_ENTITIES) $dom->myDOMNode->substituteEntities=true;
if ($mode & DOMXML_LOAD_DONT_KEEP_BLANKS) $dom->myDOMNode->preserveWhiteSpace=false;
}
function add_root($name)
{
if ($this->myDOMNode->hasChildNodes()) $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
return new php4DOMElement($this->myDOMNode->appendChild($this->myDOMNode->createElement($name)),$this->myOwnerDocument);
}
function create_attribute($name,$value)
{
$myAttr=$this->myDOMNode->createAttribute($name);
$myAttr->value=$value;
return new php4DOMAttr($myAttr,$this);
}
function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content),$this);}
function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data),$this);}
function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);}
function create_element_ns($uri,$name,$prefix=null)
{
if ($prefix==null) $prefix=$this->myDOMNode->lookupPrefix($uri);
if (($prefix==null)&&($this->myDOMNode->hasChildNodes())&&(!$this->myDOMNode->firstChild->isDefaultNamespace($uri))) $prefix='a'.sprintf('%u',crc32($uri));
return new php4DOMElement($this->myDOMNode->createElementNS($uri,$prefix==null ? $name : $prefix.':'.$name),$this);
}
function create_entity_reference($content) {return new php4DOMNode($this->myDOMNode->createEntityReference($content),$this);} //By Walter Ebert 2007-01-22
function create_text_node($content) {return new php4DOMText($this->myDOMNode->createTextNode($content),$this);}
function document_element() {return parent::_newDOMElement($this->myDOMNode->documentElement,$this);}
function dump_file($filename,$compressionmode=false,$format=false)
{
$format0=$this->myDOMNode->formatOutput;
$this->myDOMNode->formatOutput=$format;
$res=$this->myDOMNode->save($filename);
$this->myDOMNode->formatOutput=$format0;
return $res;
}
function dump_mem($format=false,$encoding=false)
{
$format0=$this->myDOMNode->formatOutput;
$this->myDOMNode->formatOutput=$format;
$encoding0=$this->myDOMNode->encoding;
if ($encoding) $this->myDOMNode->encoding=$encoding;
$dump=$this->myDOMNode->saveXML();
$this->myDOMNode->formatOutput=$format0;
if ($encoding) $this->myDOMNode->encoding= $encoding0=='' ? 'UTF-8' : $encoding0; //UTF-8 is XML default encoding
return $dump;
}
function free()
{
if ($this->myDOMNode->hasChildNodes()) $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
$this->myDOMNode=null;
$this->myOwnerDocument=null;
}
function get_element_by_id($id) {return parent::_newDOMElement($this->myDOMNode->getElementById($id),$this);}
function get_elements_by_tagname($name)
{
$myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
$nodeSet=array();
$i=0;
if (isset($myDOMNodeList))
while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this);
return $nodeSet;
}
function html_dump_mem() {return $this->myDOMNode->saveHTML();}
function root() {return parent::_newDOMElement($this->myDOMNode->documentElement,$this);}
function xpath_new_context() {return new php4DOMXPath($this);}
}
class php4DOMElement extends php4DOMNode
{
function add_namespace($uri,$prefix)
{
if ($this->myDOMNode->hasAttributeNS('http://www.w3.org/2000/xmlns/',$prefix)) return false;
else
{
$this->myDOMNode->setAttributeNS('http://www.w3.org/2000/xmlns/','xmlns:'.$prefix,$uri); //By Daniel Walker 2006-09-08
return true;
}
}
function get_attribute($name) {return $this->myDOMNode->getAttribute($name);}
function get_attribute_node($name) {return parent::_newDOMElement($this->myDOMNode->getAttributeNode($name),$this->myOwnerDocument);}
function get_elements_by_tagname($name)
{
$myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
$nodeSet=array();
$i=0;
if (isset($myDOMNodeList))
while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
return $nodeSet;
}
function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);}
function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name);}
function set_attribute($name,$value)
{
//return $this->myDOMNode->setAttribute($name,$value); //Does not return a DomAttr
$myAttr=$this->myDOMNode->ownerDocument->createAttribute($name);
$myAttr->value=$value;
$this->myDOMNode->setAttributeNode($myAttr);
return new php4DOMAttr($myAttr,$this->myOwnerDocument);
}
function set_attribute_node($attr)
{
$this->myDOMNode->setAttributeNode($this->_importNode($attr));
return $attr;
}
function set_name($name)
{
if ($this->myDOMNode->prefix=='') $newNode=$this->myDOMNode->ownerDocument->createElement($name);
else $newNode=$this->myDOMNode->ownerDocument->createElementNS($this->myDOMNode->namespaceURI,$this->myDOMNode->prefix.':'.$name);
$myDOMNodeList=$this->myDOMNode->attributes;
$i=0;
if (isset($myDOMNodeList))
while ($node=$myDOMNodeList->item($i++))
if ($node->namespaceURI=='') $newNode->setAttribute($node->name,$node->value);
else $newNode->setAttributeNS($node->namespaceURI,$node->nodeName,$node->value);
$myDOMNodeList=$this->myDOMNode->childNodes;
if (isset($myDOMNodeList))
while ($node=$myDOMNodeList->item(0)) $newNode->appendChild($node);
$this->myDOMNode->parentNode->replaceChild($newNode,$this->myDOMNode);
$this->myDOMNode=$newNode;
return true;
}
function tagname() {return $this->myDOMNode->tagName;}
}
class php4DOMNode
{
public $myDOMNode;
public $myOwnerDocument;
function php4DOMNode($aDomNode,$aOwnerDocument)
{
$this->myDOMNode=$aDomNode;
$this->myOwnerDocument=$aOwnerDocument;
}
function __get($name)
{
switch ($name)
{
case 'type': return $this->myDOMNode->nodeType;
case 'tagname': return $this->myDOMNode->tagName;
case 'content': return $this->myDOMNode->textContent;
case 'name': return $this->myDOMNode->name;
case 'value': return $this->myDOMNode->value;
default:
$myErrors=debug_backtrace();
trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',E_USER_NOTICE);
return false;
}
}
function add_child($newnode) {return append_child($newnode);}
function add_namespace($uri,$prefix) {return false;}
function append_child($newnode) {return self::_newDOMElement($this->myDOMNode->appendChild($this->_importNode($newnode)),$this->myOwnerDocument);}
function append_sibling($newnode) {return self::_newDOMElement($this->myDOMNode->parentNode->appendChild($this->_importNode($newnode)),$this->myOwnerDocument);}
function attributes()
{
$myDOMNodeList=$this->myDOMNode->attributes;
$nodeSet=array();
$i=0;
if (isset($myDOMNodeList))
while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
return $nodeSet;
}
function child_nodes()
{
$myDOMNodeList=$this->myDOMNode->childNodes;
$nodeSet=array();
$i=0;
if (isset($myDOMNodeList))
while ($node=$myDOMNodeList->item($i++)) $nodeSet[]=self::_newDOMElement($node,$this->myOwnerDocument);
return $nodeSet;
}
function children() {return $this->child_nodes();}
function clone_node($deep=false) {return self::_newDOMElement($this->myDOMNode->cloneNode($deep),$this->myOwnerDocument);}
//dump_node($node) should only be called on php4DOMDocument
function dump_node($node=null) {return $node==null ? $this->myOwnerDocument->myDOMNode->saveXML($this->myDOMNode) : $this->myOwnerDocument->myDOMNode->saveXML($node->myDOMNode);}
function first_child() {return self::_newDOMElement($this->myDOMNode->firstChild,$this->myOwnerDocument);}
function get_content() {return $this->myDOMNode->textContent;}
function has_attributes() {return $this->myDOMNode->hasAttributes();}
function has_child_nodes() {return $this->myDOMNode->hasChildNodes();}
function insert_before($newnode,$refnode) {return self::_newDOMElement($this->myDOMNode->insertBefore($this->_importNode($newnode),$refnode==null?null:$refnode->myDOMNode),$this->myOwnerDocument);}
function is_blank_node() {return ($this->myDOMNode->nodeType===XML_TEXT_NODE)&&preg_match('%^\s*$%',$this->myDOMNode->nodeValue);}
function last_child() {return self::_newDOMElement($this->myDOMNode->lastChild,$this->myOwnerDocument);}
function new_child($name,$content)
{
$mySubNode=$this->myDOMNode->ownerDocument->createElement($name);
$mySubNode->appendChild($this->myDOMNode->ownerDocument->createTextNode(html_entity_decode($content,ENT_QUOTES)));
$this->myDOMNode->appendChild($mySubNode);
return new php4DOMElement($mySubNode,$this->myOwnerDocument);
}
function next_sibling() {return self::_newDOMElement($this->myDOMNode->nextSibling,$this->myOwnerDocument);}
function node_name() {return ($this->myDOMNode->nodeType===XML_ELEMENT_NODE) ? $this->myDOMNode->localName : $this->myDOMNode->nodeName;} //Avoid namespace prefix for DOMElement
function node_type() {return $this->myDOMNode->nodeType;}
function node_value() {return $this->myDOMNode->nodeValue;}
function owner_document() {return $this->myOwnerDocument;}
function parent_node() {return self::_newDOMElement($this->myDOMNode->parentNode,$this->myOwnerDocument);}
function prefix() {return $this->myDOMNode->prefix;}
function previous_sibling() {return self::_newDOMElement($this->myDOMNode->previousSibling,$this->myOwnerDocument);}
function remove_child($oldchild) {return self::_newDOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode),$this->myOwnerDocument);}
function replace_child($newnode,$oldnode) {return self::_newDOMElement($this->myDOMNode->replaceChild($this->_importNode($newnode),$oldnode->myDOMNode),$this->myOwnerDocument);}
function set_content($text) {return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($text));}
//function set_name($name) {return $this->myOwnerDocument->renameNode($this->myDOMNode,$this->myDOMNode->namespaceURI,$name);}
function set_namespace($uri,$prefix=null)
{//Contributions by Daniel Walker 2006-09-08
$nsprefix=$this->myDOMNode->lookupPrefix($uri);
if ($nsprefix==null)
{
$nsprefix= $prefix==null ? $nsprefix='a'.sprintf('%u',crc32($uri)) : $prefix;
if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE)
{
if (($prefix!=null)&&$this->myDOMNode->ownerElement->hasAttributeNS('http://www.w3.org/2000/xmlns/',$nsprefix)&&
($this->myDOMNode->ownerElement->getAttributeNS('http://www.w3.org/2000/xmlns/',$nsprefix)!=$uri))
{//Remove namespace
$parent=$this->myDOMNode->ownerElement;
$parent->removeAttributeNode($this->myDOMNode);
$parent->setAttribute($this->myDOMNode->localName,$this->myDOMNode->nodeValue);
$this->myDOMNode=$parent->getAttributeNode($this->myDOMNode->localName);
return;
}
$this->myDOMNode->ownerElement->setAttributeNS('http://www.w3.org/2000/xmlns/','xmlns:'.$nsprefix,$uri);
}
}
if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE)
{
$parent=$this->myDOMNode->ownerElement;
$parent->removeAttributeNode($this->myDOMNode);
$parent->setAttributeNS($uri,$nsprefix.':'.$this->myDOMNode->localName,$this->myDOMNode->nodeValue);
$this->myDOMNode=$parent->getAttributeNodeNS($uri,$this->myDOMNode->localName);
}
elseif ($this->myDOMNode->nodeType===XML_ELEMENT_NODE)
{
$NewNode=$this->myDOMNode->ownerDocument->createElementNS($uri,$nsprefix.':'.$this->myDOMNode->localName);
foreach ($this->myDOMNode->attributes as $n) $NewNode->appendChild($n->cloneNode(true));
foreach ($this->myDOMNode->childNodes as $n) $NewNode->appendChild($n->cloneNode(true));
$xpath=new DOMXPath($this->myDOMNode->ownerDocument);
$myDOMNodeList=$xpath->query('namespace::*[name()!="xml"]',$this->myDOMNode); //Add old namespaces
foreach ($myDOMNodeList as $n) $NewNode->setAttributeNS('http://www.w3.org/2000/xmlns/',$n->nodeName,$n->nodeValue);
$this->myDOMNode->parentNode->replaceChild($NewNode,$this->myDOMNode);
$this->myDOMNode=$NewNode;
}
}
function unlink_node()
{
if ($this->myDOMNode->parentNode!=null)
{
if ($this->myDOMNode->nodeType===XML_ATTRIBUTE_NODE) $this->myDOMNode->parentNode->removeAttributeNode($this->myDOMNode);
else $this->myDOMNode->parentNode->removeChild($this->myDOMNode);
}
}
protected function _importNode($newnode) {return $this->myOwnerDocument===$newnode->myOwnerDocument ? $newnode->myDOMNode : $this->myOwnerDocument->myDOMNode->importNode($newnode->myDOMNode,true);} //To import DOMNode from another DOMDocument
static function _newDOMElement($aDOMNode,$aOwnerDocument)
{//Check the PHP5 DOMNode before creating a new associated PHP4 DOMNode wrapper
if ($aDOMNode==null) return null;
switch ($aDOMNode->nodeType)
{
case XML_ELEMENT_NODE: return new php4DOMElement($aDOMNode,$aOwnerDocument);
case XML_TEXT_NODE: return new php4DOMText($aDOMNode,$aOwnerDocument);
case XML_ATTRIBUTE_NODE: return new php4DOMAttr($aDOMNode,$aOwnerDocument);
default: return new php4DOMNode($aDOMNode,$aOwnerDocument);
}
}
}
class php4DOMText extends php4DOMNode
{
function __get($name)
{
if ($name==='tagname') return '#text';
else return parent::__get($name);
}
function tagname() {return '#text';}
}
if (!defined('XPATH_NODESET'))
{
define('XPATH_UNDEFINED',0);
define('XPATH_NODESET',1);
/*define('XPATH_BOOLEAN',2);
define('XPATH_NUMBER',3);
define('XPATH_STRING',4);
define('XPATH_POINT',5);
define('XPATH_RANGE',6);
define('XPATH_LOCATIONSET',7);
define('XPATH_USERS',8);
define('XPATH_XSLT_TREE',9);*/
}
class php4DOMNodelist
{//TODO: To be updated for PHP>=5.1 to allow XPath boolean expressions etc. DOMXPath->evaluate()
private $myDOMNodelist;
public $nodeset;
public $type;
function php4DOMNodelist($aDOMNodelist,$aOwnerDocument)
{
$this->myDOMNodelist=$aDOMNodelist;
$this->nodeset=array();
$i=0;
if (isset($this->myDOMNodelist))
{
$this->type=XPATH_NODESET;
while ($node=$this->myDOMNodelist->item($i++)) $this->nodeset[]=php4DOMNode::_newDOMElement($node,$aOwnerDocument);
}
else $this->type=XPATH_UNDEFINED;
}
}
class php4DOMXPath
{
public $myDOMXPath;
private $myOwnerDocument;
function php4DOMXPath($dom_document)
{
//TODO: If $dom_document is a DomElement, make that default $contextnode and modify XPath. Ex: '/test'
$this->myOwnerDocument=$dom_document->myOwnerDocument;
$this->myDOMXPath=new DOMXPath($this->myOwnerDocument->myDOMNode);
}
function xpath_eval($eval_str,$contextnode=null) {return isset($contextnode) ? new php4DOMNodelist($this->myDOMXPath->query($eval_str,$contextnode->myDOMNode),$this->myOwnerDocument) : new php4DOMNodelist($this->myDOMXPath->query($eval_str),$this->myOwnerDocument);}
function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
}
if (extension_loaded('xsl'))
{//See also: http://alexandre.alapetite.net/doc-alex/xslt-php4-php5/
function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring));}
function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document);}
function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile));}
class php4DomXsltStylesheet
{
private $myxsltProcessor;
function php4DomXsltStylesheet($dom_document)
{
$this->myxsltProcessor=new xsltProcessor();
$this->myxsltProcessor->importStyleSheet($dom_document);
}
function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false)
{
foreach ($xslt_parameters as $param=>$value) $this->myxsltProcessor->setParameter('',$param,$value);
$myphp4DOMDocument=new php4DOMDocument();
$myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode);
return $myphp4DOMDocument;
}
function result_dump_file($dom_document,$filename)
{
$html=$dom_document->myDOMNode->saveHTML();
file_put_contents($filename,$html);
return $html;
}
function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML();}
}
}
?>
From cvs at kolab.org Tue Jul 17 18:39:36 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 18:39:36 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates
imapd.annotation_definitions.template.in, NONE, 1.1
Message-ID: <20070717163936.BA54960C4C8@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv17004/kolabd/kolabd/templates
Added Files:
imapd.annotation_definitions.template.in
Log Message:
Add forgotten new files from Kolab 2.2-beta1 release.
--- NEW FILE: imapd.annotation_definitions.template.in ---
KOLAB_META_START
TARGET=@imap_confdir@/imapd.annotation_definitions
PERMISSIONS=0640
OWNERSHIP=@imap_usr@:@imap_grp@
KOLAB_META_END
/vendor/kolab/folder-test,mailbox,string,backend,value.shared value.priv,a
/vendor/kolab/folder-type,mailbox,string,backend,value.shared value.priv,a
/vendor/kolab/incidences-for,mailbox,string,backend,value.shared value.priv,a
/vendor/x-toltec/test,mailbox,string,backend,value.shared value.priv,a
From cvs at kolab.org Tue Jul 17 18:40:04 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 18:40:04 +0200 (CEST)
Subject: thomas: server Makefile,1.19,1.20
Message-ID: <20070717164004.3B90260C4C8@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv17037
Modified Files:
Makefile
Log Message:
Ported Makefile from 2.1 branch to HEAD
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile 11 Jul 2007 14:38:06 -0000 1.19
+++ Makefile 17 Jul 2007 16:40:02 -0000 1.20
@@ -24,14 +24,14 @@
dist:
rm -rf stage
mkdir stage
- for PKG in $(BASE_PACKAGES); \
- do \
- cd $$PKG && make dist;cd ..;\
+ for PKG in $(BASE_PACKAGES); \
+ do \
+ make -C $$PKG dist || exit $?; \
done
cd perl-kolab && make -f Makefile.cvs dist
- for PKG in $(KOLAB_PACKAGES); \
- do \
- cd $$PKG && make dist;cd ..;\
+ for PKG in $(KOLAB_PACKAGES); \
+ do \
+ cd $$PKG && make dist || exit $?; cd ..; \
done
cp $(BASE_FILES) stage/
echo 'Remember to update obmtool.conf!'
@@ -57,12 +57,12 @@
horde/horde-turba
.PHONY: dist-horde
-dist-horde:
+dist-horde:
rm -rf stage
mkdir -p stage
for PKG in $(HORDE_PACKAGES); \
do \
- cd $$PKG && make dist;cd ../..; \
+ make -C $$PKG dist || exit $?; \
echo -e "\n==" >> stage/ChangeLog; \
echo "$$PKG" >> stage/ChangeLog; \
echo -e "==\n" >> stage/ChangeLog; \
@@ -72,5 +72,5 @@
cp obmtool-webclient.conf stage/obmtool.conf
.PHONY: clean
-clean:
- rm -rf stage
\ No newline at end of file
+clean:
+ rm -rf stage
From cvs at kolab.org Tue Jul 17 18:44:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 18:44:20 +0200 (CEST)
Subject: thomas: server Makefile,1.20,1.21
Message-ID: <20070717164420.3B5A9600177@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv17195
Modified Files:
Makefile
Log Message:
Updated global Makefile for packages/files in Kolab server 2.2-beta1
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile 17 Jul 2007 16:40:02 -0000 1.20
+++ Makefile 17 Jul 2007 16:44:18 -0000 1.21
@@ -1,13 +1,4 @@
-BASE_PACKAGES=file \
- spamassassin \
- clamav \
- amavisd \
- imap \
- apache \
- php \
- openldap \
- imapd \
- postfix \
+BASE_PACKAGES=openldap \
php-smarty
KOLAB_PACKAGES=kolabd \
@@ -16,8 +7,9 @@
kolab-resource-handlers \
kolab-webadmin \
-BASE_FILES=obmtool \
- obmtool.conf \
+BASE_FILES=install-kolab.sh \
+ 00INDEX.rdf \
+ LIESMICH.txt \
README.1st
.PHONY: dist
@@ -34,7 +26,7 @@
cd $$PKG && make dist || exit $?; cd ..; \
done
cp $(BASE_FILES) stage/
- echo 'Remember to update obmtool.conf!'
+ echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
HORDE_PACKAGES=pear/PEAR-PEAR \
pear/PEAR-Archive_Tar \
From cvs at kolab.org Tue Jul 17 18:50:32 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Jul 2007 18:50:32 +0200 (CEST)
Subject: thomas: server/openldap Makefile,1.18,1.19
Message-ID: <20070717165032.43CEB600177@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/openldap
In directory doto:/tmp/cvs-serv17369/openldap
Modified Files:
Makefile
Log Message:
Ported from 2.1 branch: Download openldap source rpm from Kolab ftp mirror.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile 10 Jan 2007 16:25:25 -0000 1.18
+++ Makefile 17 Jul 2007 16:50:30 -0000 1.19
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/stable/2.20061018/SRC/BASE
+ KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -17,7 +17,6 @@
KOLABRELEASE=2.20061110_kolab
RPM=/kolab/bin/openpkg rpm
-KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
From cvs at kolab.org Thu Jul 19 17:45:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:45:25 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.131,1.131.2.1
Message-ID: <20070719154525.4349F600175@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv11781
Modified Files:
Tag: kolab_2_1_branch
release-notes.txt
Log Message:
Fix kolab/issue1025 (loading policy bank "MYUSERS": unknown field "mynetworks")
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.131
retrieving revision 1.131.2.1
diff -u -d -r1.131 -r1.131.2.1
--- release-notes.txt 12 Jul 2007 14:06:54 -0000 1.131
+++ release-notes.txt 19 Jul 2007 15:45:22 -0000 1.131.2.1
@@ -49,6 +49,7 @@
autoconfiscated kolabdcachetool, dirservnotify and dirservupdate.
kolab/issue919 (kolab server has problems with some characters in passwords)
+ kolab/issue1025 (loading policy bank "MYUSERS": unknown field "mynetworks")
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)
From cvs at kolab.org Thu Jul 19 17:45:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:45:25 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.10,
1.10.2.1
Message-ID: <20070719154525.448AD60C4A1@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv11781/kolabd/kolabd/templates
Modified Files:
Tag: kolab_2_1_branch
amavisd.conf.template.in
Log Message:
Fix kolab/issue1025 (loading policy bank "MYUSERS": unknown field "mynetworks")
Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- amavisd.conf.template.in 17 Feb 2007 10:31:19 -0000 1.10
+++ amavisd.conf.template.in 19 Jul 2007 15:45:22 -0000 1.10.2.1
@@ -1515,7 +1515,6 @@
warnbannedrecip_maps => undef,# (defaults to false (undef))
warnvirussender => 1,
warnbannedsender => 1,
- mynetworks => qw(0.0.0.0/0),
};
From cvs at kolab.org Thu Jul 19 17:45:29 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:45:29 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.131,1.132
Message-ID: <20070719154529.38B9060C4A5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv11788
Modified Files:
release-notes.txt
Log Message:
Fix kolab/issue1025 (loading policy bank "MYUSERS": unknown field "mynetworks")
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- release-notes.txt 12 Jul 2007 14:06:54 -0000 1.131
+++ release-notes.txt 19 Jul 2007 15:45:27 -0000 1.132
@@ -49,6 +49,7 @@
autoconfiscated kolabdcachetool, dirservnotify and dirservupdate.
kolab/issue919 (kolab server has problems with some characters in passwords)
+ kolab/issue1025 (loading policy bank "MYUSERS": unknown field "mynetworks")
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)
From cvs at kolab.org Thu Jul 19 17:45:29 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:45:29 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.10,
1.11
Message-ID: <20070719154529.821B460C4A5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv11788/kolabd/kolabd/templates
Modified Files:
amavisd.conf.template.in
Log Message:
Fix kolab/issue1025 (loading policy bank "MYUSERS": unknown field "mynetworks")
Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- amavisd.conf.template.in 17 Feb 2007 10:31:19 -0000 1.10
+++ amavisd.conf.template.in 19 Jul 2007 15:45:27 -0000 1.11
@@ -1515,7 +1515,6 @@
warnbannedrecip_maps => undef,# (defaults to false (undef))
warnvirussender => 1,
warnbannedsender => 1,
- mynetworks => qw(0.0.0.0/0),
};
From cvs at kolab.org Thu Jul 19 17:54:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:54:43 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-PEAR ChangeLog, 1.1, NONE Makefile, 1.3,
NONE PEAR-PEAR.spec, 1.2, NONE
Message-ID: <20070719155443.2870F600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-PEAR
In directory doto:/tmp/cvs-serv12122/PEAR-PEAR
Removed Files:
ChangeLog Makefile PEAR-PEAR.spec
Log Message:
A recent PEAR-PEAR is part of php
--- ChangeLog DELETED ---
--- Makefile DELETED ---
--- PEAR-PEAR.spec DELETED ---
From cvs at kolab.org Thu Jul 19 17:55:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:55:25 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Archive_Tar PEAR-Archive_Tar.spec,1.2,1.3
Message-ID: <20070719155525.EF0D4600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv12185/PEAR-Archive_Tar
Modified Files:
PEAR-Archive_Tar.spec
Log Message:
Update the PEAR packages for Kolab-Server-2.2
Index: PEAR-Archive_Tar.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Archive_Tar/PEAR-Archive_Tar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Archive_Tar.spec 24 May 2007 14:49:39 -0000 1.2
+++ PEAR-Archive_Tar.spec 19 Jul 2007 15:55:23 -0000 1.3
@@ -16,6 +16,12 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: OpenPKG, openpkg >= 20070603
+PreReq: php, php::with_pear = yes
+
%description
This class provides handling of tar files in PHP.
It supports creating, listing, extracting and adding to tar files.
From cvs at kolab.org Thu Jul 19 17:55:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:55:25 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Auth_SASL PEAR-Auth_SASL.spec,1.2,1.3
Message-ID: <20070719155525.F284860C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv12185/PEAR-Auth_SASL
Modified Files:
PEAR-Auth_SASL.spec
Log Message:
Update the PEAR packages for Kolab-Server-2.2
Index: PEAR-Auth_SASL.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/PEAR-Auth_SASL.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Auth_SASL.spec 24 May 2007 14:49:39 -0000 1.2
+++ PEAR-Auth_SASL.spec 19 Jul 2007 15:55:23 -0000 1.3
@@ -18,8 +18,12 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: PEAR-PEAR >= 1.4.7
-PreReq: PEAR-PEAR >= 1.4.7
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: OpenPKG, openpkg >= 20070603
+PreReq: php, php::with_pear = yes
%description
Provides code to generate responses to common SASL mechanisms, including:
From cvs at kolab.org Thu Jul 19 17:55:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:55:26 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Console_Getopt PEAR-Console_Getopt.spec, 1.2,
1.3
Message-ID: <20070719155526.021B560C4A2@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv12185/PEAR-Console_Getopt
Modified Files:
PEAR-Console_Getopt.spec
Log Message:
Update the PEAR packages for Kolab-Server-2.2
Index: PEAR-Console_Getopt.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Console_Getopt/PEAR-Console_Getopt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Console_Getopt.spec 24 May 2007 14:49:39 -0000 1.2
+++ PEAR-Console_Getopt.spec 19 Jul 2007 15:55:23 -0000 1.3
@@ -16,6 +16,12 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: OpenPKG, openpkg >= 20070603
+PreReq: php, php::with_pear = yes
+
%description
This is a PHP implementation of "getopt" supporting both
short and long options.
From cvs at kolab.org Thu Jul 19 17:55:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:55:26 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Date PEAR-Date.spec,1.2,1.3
Message-ID: <20070719155526.0688E60C4A5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Date
In directory doto:/tmp/cvs-serv12185/PEAR-Date
Modified Files:
PEAR-Date.spec
Log Message:
Update the PEAR packages for Kolab-Server-2.2
Index: PEAR-Date.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/PEAR-Date.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Date.spec 24 May 2007 14:49:39 -0000 1.2
+++ PEAR-Date.spec 19 Jul 2007 15:55:24 -0000 1.3
@@ -18,8 +18,12 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: PEAR-PEAR >= 1.4.7
-PreReq: PEAR-PEAR >= 1.4.7
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: OpenPKG, openpkg >= 20070603
+PreReq: php, php::with_pear = yes
%description
Generic classes for representation and manipulation of
From cvs at kolab.org Thu Jul 19 17:55:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:55:26 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail PEAR-Mail.spec,1.2,1.3
Message-ID: <20070719155526.44303600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail
In directory doto:/tmp/cvs-serv12185/PEAR-Mail
Modified Files:
PEAR-Mail.spec
Log Message:
Update the PEAR packages for Kolab-Server-2.2
Index: PEAR-Mail.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/PEAR-Mail.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Mail.spec 24 May 2007 14:49:39 -0000 1.2
+++ PEAR-Mail.spec 19 Jul 2007 15:55:24 -0000 1.3
@@ -18,8 +18,12 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: PEAR-PEAR >= 1.4.7
-PreReq: PEAR-PEAR >= 1.4.7
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: OpenPKG, openpkg >= 20070603
+PreReq: php, php::with_pear = yes
%description
PEAR's Mail package defines an interface for implementing mailers under the
From cvs at kolab.org Thu Jul 19 17:55:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:55:26 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Log PEAR-Log.spec,1.2,1.3
Message-ID: <20070719155526.0A82A60C4A6@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv12185/PEAR-Log
Modified Files:
PEAR-Log.spec
Log Message:
Update the PEAR packages for Kolab-Server-2.2
Index: PEAR-Log.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/PEAR-Log.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Log.spec 24 May 2007 14:49:39 -0000 1.2
+++ PEAR-Log.spec 19 Jul 2007 15:55:24 -0000 1.3
@@ -18,8 +18,12 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: PEAR-PEAR >= 1.4.7
-PreReq: PEAR-PEAR >= 1.4.7
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: OpenPKG, openpkg >= 20070603
+PreReq: php, php::with_pear = yes
%description
The Log framework provides an abstracted logging system. It supports
From cvs at kolab.org Thu Jul 19 17:55:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:55:26 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail_Mime PEAR-Mail_Mime.spec,1.2,1.3
Message-ID: <20070719155526.860F7600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv12185/PEAR-Mail_Mime
Modified Files:
PEAR-Mail_Mime.spec
Log Message:
Update the PEAR packages for Kolab-Server-2.2
Index: PEAR-Mail_Mime.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail_Mime/PEAR-Mail_Mime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Mail_Mime.spec 24 May 2007 14:49:39 -0000 1.2
+++ PEAR-Mail_Mime.spec 19 Jul 2007 15:55:24 -0000 1.3
@@ -18,8 +18,12 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: PEAR-PEAR >= 1.4.7
-PreReq: PEAR-PEAR >= 1.4.7
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: OpenPKG, openpkg >= 20070603
+PreReq: php, php::with_pear = yes
%description
Provides classes to deal with creation and manipulation of mime messages.
From cvs at kolab.org Thu Jul 19 17:55:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:55:26 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Sieve PEAR-Net_Sieve.spec,1.2,1.3
Message-ID: <20070719155526.C589E600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv12185/PEAR-Net_Sieve
Modified Files:
PEAR-Net_Sieve.spec
Log Message:
Update the PEAR packages for Kolab-Server-2.2
Index: PEAR-Net_Sieve.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Sieve/PEAR-Net_Sieve.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Net_Sieve.spec 24 May 2007 14:49:39 -0000 1.2
+++ PEAR-Net_Sieve.spec 19 Jul 2007 15:55:24 -0000 1.3
@@ -18,8 +18,13 @@
# 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
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: OpenPKG, openpkg >= 20070603
+PreReq: php, php::with_pear = yes
+PreReq: PEAR-Net_Socket >= 1.0
%description
Provides an API to talk to the timsieved server that comes
From cvs at kolab.org Thu Jul 19 17:55:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:55:26 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Socket PEAR-Net_Socket.spec,1.2,1.3
Message-ID: <20070719155526.C803B60C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv12185/PEAR-Net_Socket
Modified Files:
PEAR-Net_Socket.spec
Log Message:
Update the PEAR packages for Kolab-Server-2.2
Index: PEAR-Net_Socket.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/PEAR-Net_Socket.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PEAR-Net_Socket.spec 24 May 2007 14:49:39 -0000 1.2
+++ PEAR-Net_Socket.spec 19 Jul 2007 15:55:24 -0000 1.3
@@ -18,8 +18,12 @@
# 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
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: OpenPKG, openpkg >= 20070603
+PreReq: php, php::with_pear = yes
%description
Net_Socket is a class interface to TCP sockets. It provides blocking
From cvs at kolab.org Thu Jul 19 17:56:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:56:24 +0200 (CEST)
Subject: gunnar: server/horde/horde horde-kolab.spec,1.3,1.4
Message-ID: <20070719155624.3AB48600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv12317/horde
Modified Files:
horde-kolab.spec
Log Message:
Updated the horde packages for Kolab-Server-2.2
Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
@@ -2,8 +2,8 @@
%define V_horde_name horde
%define V_package %{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -30,8 +30,15 @@
# 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
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: PEAR-Mail_Mime >= 1.3.1
+PreReq: PEAR-Mail >= 1.1.14
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Thu Jul 19 17:56:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:56:24 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith horde-kronolith-kolab.spec, 1.3,
1.4
Message-ID: <20070719155624.61CEF60C4A6@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv12317/horde-kronolith
Modified Files:
horde-kronolith-kolab.spec
Log Message:
Updated the horde packages for Kolab-Server-2.2
Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-kronolith-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-kronolith-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
@@ -2,8 +2,8 @@
%define V_horde_name kronolith
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -28,8 +28,13 @@
# 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
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Thu Jul 19 17:56:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:56:24 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo horde-mnemo-kolab.spec,1.3,1.4
Message-ID: <20070719155624.64CEB60C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv12317/horde-mnemo
Modified Files:
horde-mnemo-kolab.spec
Log Message:
Updated the horde packages for Kolab-Server-2.2
Index: horde-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-mnemo-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-mnemo-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
@@ -2,8 +2,8 @@
%define V_horde_name mnemo
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -27,8 +27,14 @@
# 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
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: PEAR-Net_Sieve >= 1.1.5
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Thu Jul 19 17:56:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:56:24 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo horde-ingo-kolab.spec,1.3,1.4
Message-ID: <20070719155624.5F6CA60C4A5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv12317/horde-ingo
Modified Files:
horde-ingo-kolab.spec
Log Message:
Updated the horde packages for Kolab-Server-2.2
Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-ingo-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-ingo-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
@@ -2,8 +2,8 @@
%define V_horde_name ingo
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -28,8 +28,14 @@
# 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
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: PEAR-Net_Sieve >= 1.1.5
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Thu Jul 19 17:56:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:56:24 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework horde-framework-kolab.spec, 1.5,
1.6
Message-ID: <20070719155624.58159600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv12317/horde-framework
Modified Files:
horde-framework-kolab.spec
Log Message:
Updated the horde packages for Kolab-Server-2.2
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-framework-kolab.spec 31 May 2007 14:31:10 -0000 1.5
+++ horde-framework-kolab.spec 19 Jul 2007 15:56:22 -0000 1.6
@@ -2,8 +2,8 @@
%define V_horde_name framework
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -41,8 +41,12 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: PEAR-PEAR >= 1.4.0
-PreReq: apache >= 1.2.29
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
@@ -72,7 +76,7 @@
rm -rf %{l_prefix}/.pearrc
for PKG in **/package.xml; do \
- if [ "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" ]; then \
+ if [ "$PKG" != "Role_Webroot/package.xml" -a "$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 Thu Jul 19 17:56:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:56:24 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp horde-imp-kolab.spec,1.4,1.5
Message-ID: <20070719155624.5A83E60C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv12317/horde-imp
Modified Files:
horde-imp-kolab.spec
Log Message:
Updated the horde packages for Kolab-Server-2.2
Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-imp-kolab.spec 31 May 2007 14:31:10 -0000 1.4
+++ horde-imp-kolab.spec 19 Jul 2007 15:56:22 -0000 1.5
@@ -2,8 +2,8 @@
%define V_horde_name imp
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -28,8 +28,14 @@
# 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
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: PEAR-Auth_SASL >= 1.0.2
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Thu Jul 19 17:56:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:56:24 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag horde-nag-kolab.spec,1.3,1.4
Message-ID: <20070719155624.9B687600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv12317/horde-nag
Modified Files:
horde-nag-kolab.spec
Log Message:
Updated the horde packages for Kolab-Server-2.2
Index: horde-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-nag-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-nag-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
@@ -2,8 +2,8 @@
%define V_horde_name nag
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -27,8 +27,13 @@
# 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
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Thu Jul 19 17:56:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:56:25 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd horde-passwd-kolab.spec,1.3,1.4
Message-ID: <20070719155625.3AD6E600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv12317/horde-passwd
Modified Files:
horde-passwd-kolab.spec
Log Message:
Updated the horde packages for Kolab-Server-2.2
Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-passwd-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-passwd-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
@@ -2,8 +2,8 @@
%define V_horde_name passwd
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -27,8 +27,13 @@
# 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
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Thu Jul 19 17:56:25 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:56:25 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba horde-turba-kolab.spec, 1.4,
1.5 lib-Driver-ldap.php.patch, 1.1, 1.2 lib-base.php.patch, 1.1, NONE
Message-ID: <20070719155625.3DCED60C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv12317/horde-turba
Modified Files:
horde-turba-kolab.spec lib-Driver-ldap.php.patch
Removed Files:
lib-base.php.patch
Log Message:
Updated the horde packages for Kolab-Server-2.2
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-turba-kolab.spec 31 May 2007 14:31:10 -0000 1.4
+++ horde-turba-kolab.spec 19 Jul 2007 15:56:22 -0000 1.5
@@ -2,8 +2,8 @@
%define V_horde_name turba
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -32,7 +32,8 @@
#
# The second part of the patch allows to rename
# shares
-Patch0: lib-Turba.php.patch
+#Patch0: lib-Turba.php.patch
+# FIXME: Disabled for now.
##################################################
# PATCH COMMENT
@@ -40,22 +41,19 @@
# 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
+Patch0: config-sources.php.dist.patch
+Patch1: lib-Driver-ldap.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
+
+#Pre requisites
+BuildPreReq: OpenPKG, openpkg >= 20070603
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
@@ -81,8 +79,7 @@
cd %{V_horde_name}
%patch -p0 -P 0
%patch -p0 -P 1
- %patch -p0 -P 2
- %patch -p0 -P 3
+# %patch -p0 -P 2
cd ..
%build
Index: lib-Driver-ldap.php.patch
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/lib-Driver-ldap.php.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lib-Driver-ldap.php.patch 25 May 2007 12:07:17 -0000 1.1
+++ lib-Driver-ldap.php.patch 19 Jul 2007 15:56:22 -0000 1.2
@@ -4,7 +4,7 @@
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
++++ lib/Driver/ldap.php 18 Jun 2007 15:15:15 -0000
@@ -54,6 +54,9 @@
if (empty($params['deref'])) {
$params['deref'] = LDAP_DEREF_NEVER;
@@ -29,7 +29,7 @@
+ */
+ function hasPermission($perm)
+ {
-+ if ($this->usingShares || $this->_params['read_only'] === false) {
++ if ($this->_params['read_only'] === false) {
+ return parent::hasPermission($perm);
+ } else {
+ switch ($perm) {
--- lib-base.php.patch DELETED ---
From cvs at kolab.org Thu Jul 19 17:57:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 17:57:41 +0200 (CEST)
Subject: gunnar: server Makefile,1.21,1.22
Message-ID: <20070719155741.7DB3D600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv12404
Modified Files:
Makefile
Log Message:
Updated the Makefile so that it builds the horde packages again.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile 17 Jul 2007 16:44:18 -0000 1.21
+++ Makefile 19 Jul 2007 15:57:39 -0000 1.22
@@ -7,29 +7,7 @@
kolab-resource-handlers \
kolab-webadmin \
-BASE_FILES=install-kolab.sh \
- 00INDEX.rdf \
- LIESMICH.txt \
- README.1st
-
-.PHONY: dist
-dist:
- rm -rf stage
- mkdir stage
- for PKG in $(BASE_PACKAGES); \
- do \
- make -C $$PKG dist || exit $?; \
- done
- cd perl-kolab && make -f Makefile.cvs dist
- for PKG in $(KOLAB_PACKAGES); \
- do \
- cd $$PKG && make dist || exit $?; cd ..; \
- done
- cp $(BASE_FILES) stage/
- echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
-
-HORDE_PACKAGES=pear/PEAR-PEAR \
- pear/PEAR-Archive_Tar \
+HORDE_PACKAGES=pear/PEAR-Archive_Tar \
pear/PEAR-Auth_SASL \
pear/PEAR-Console_Getopt \
pear/PEAR-Date \
@@ -48,21 +26,50 @@
horde/horde-nag \
horde/horde-turba
-.PHONY: dist-horde
-dist-horde:
- rm -rf stage
- mkdir -p stage
- for PKG in $(HORDE_PACKAGES); \
- do \
- make -C $$PKG dist || exit $?; \
- echo -e "\n==" >> stage/ChangeLog; \
- echo "$$PKG" >> stage/ChangeLog; \
- echo -e "==\n" >> stage/ChangeLog; \
- cat $$PKG/ChangeLog >> stage/ChangeLog; \
+BASE_FILES=install-kolab.sh \
+ 00INDEX.rdf \
+ LIESMICH.txt \
+ README.1st \
+ README.webclient
+
+.PHONY: all
+all: stage base kolab horde files
+
+stage:
+ mkdir stage
+
+.PHONY: base
+base:
+ for PKG in $(BASE_PACKAGES); \
+ do \
+ make -C $$PKG dist || exit $?; \
done
- cp README.webclient stage/README
- cp obmtool-webclient.conf stage/obmtool.conf
+
+.PHONY: kolab
+kolab:
+ cd perl-kolab && make -f Makefile.cvs dist
+ for PKG in $(KOLAB_PACKAGES); \
+ do \
+ cd $$PKG && make dist || exit $?; cd ..; \
+ done
+
+.PHONY: horde
+horde:
+ for PKG in $(HORDE_PACKAGES); \
+ do \
+ make -C $$PKG dist || exit $?; \
+ echo -e "\n==" >> stage/ChangeLog.horde; \
+ echo "$$PKG" >> stage/ChangeLog.horde; \
+ echo -e "==\n" >> stage/ChangeLog.horde; \
+ cat $$PKG/ChangeLog >> stage/ChangeLog.horde; \
+ done
+
+.PHONY: files
+files:
+ cp $(BASE_FILES) stage/
+ echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
.PHONY: clean
clean:
rm -rf stage
+ find . -name "*.src.rpm" -exec rm -f {} \;
\ No newline at end of file
From cvs at kolab.org Thu Jul 19 18:47:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 18:47:49 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.131.2.1,1.131.2.2
Message-ID: <20070719164749.62FD160C4A2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv14118
Modified Files:
Tag: kolab_2_1_branch
release-notes.txt
Log Message:
Fix kolab/issue1861 (imapd.conf.template: primary domain listed twice in loginrealms)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.131.2.1
retrieving revision 1.131.2.2
diff -u -d -r1.131.2.1 -r1.131.2.2
--- release-notes.txt 19 Jul 2007 15:45:22 -0000 1.131.2.1
+++ release-notes.txt 19 Jul 2007 16:47:47 -0000 1.131.2.2
@@ -54,6 +54,7 @@
kolab/issue1679 (Update template META mechanism to support service restarts)
kolab/issue1693 (Automatically trigger f/b cache regeneration)
kolab/issue1804 (Several files apparently missing in kolabd 2.1.0 package)
+ kolab/issue1861 (imapd.conf.template: primary domain listed twice in loginrealms)
- kolab-resource-handlers-2.1.0-2007????
From cvs at kolab.org Thu Jul 19 18:47:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 18:47:49 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates imapd.conf.template.in, 1.10,
1.10.2.1
Message-ID: <20070719164749.65F8660C4A5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv14118/kolabd/kolabd/templates
Modified Files:
Tag: kolab_2_1_branch
imapd.conf.template.in
Log Message:
Fix kolab/issue1861 (imapd.conf.template: primary domain listed twice in loginrealms)
Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- imapd.conf.template.in 10 Jan 2007 18:31:25 -0000 1.10
+++ imapd.conf.template.in 19 Jul 2007 16:47:47 -0000 1.10.2.1
@@ -52,7 +52,7 @@
##virtdomains: userid
-loginrealms: @@@postfix-mydomain@@@ @@@postfix-mydestination|join( )@@@
+loginrealms: @@@postfix-mydestination|join( )@@@
# support for lookup of mailbox name from local LDAP server
ldap_uri: @@@user_ldap_uri@@@
From cvs at kolab.org Thu Jul 19 18:47:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 18:47:59 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.132,1.133
Message-ID: <20070719164759.91B6360C4A2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv14134
Modified Files:
release-notes.txt
Log Message:
Fix kolab/issue1861 (imapd.conf.template: primary domain listed twice in loginrealms)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- release-notes.txt 19 Jul 2007 15:45:27 -0000 1.132
+++ release-notes.txt 19 Jul 2007 16:47:57 -0000 1.133
@@ -54,6 +54,7 @@
kolab/issue1679 (Update template META mechanism to support service restarts)
kolab/issue1693 (Automatically trigger f/b cache regeneration)
kolab/issue1804 (Several files apparently missing in kolabd 2.1.0 package)
+ kolab/issue1861 (imapd.conf.template: primary domain listed twice in loginrealms)
- kolab-resource-handlers-2.1.0-2007????
From cvs at kolab.org Thu Jul 19 18:47:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Jul 2007 18:47:59 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates imapd.conf.template.in, 1.11,
1.12
Message-ID: <20070719164759.D38AA60C4A2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv14134/kolabd/kolabd/templates
Modified Files:
imapd.conf.template.in
Log Message:
Fix kolab/issue1861 (imapd.conf.template: primary domain listed twice in loginrealms)
Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- imapd.conf.template.in 17 Jul 2007 15:26:05 -0000 1.11
+++ imapd.conf.template.in 19 Jul 2007 16:47:57 -0000 1.12
@@ -52,7 +52,7 @@
##virtdomains: userid
-loginrealms: @@@postfix-mydomain@@@ @@@postfix-mydestination|join( )@@@
+loginrealms: @@@postfix-mydestination|join( )@@@
# support for lookup of mailbox name from local LDAP server
ldap_uri: @@@user_ldap_uri@@@
From cvs at kolab.org Fri Jul 20 12:59:54 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 12:59:54 +0200 (CEST)
Subject: gunnar: server Makefile,1.22,1.23
Message-ID: <20070720105954.2884060C4A2@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv8609
Modified Files:
Makefile
Log Message:
Keep the dist target, add some dependencies and revert newline change.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile 19 Jul 2007 15:57:39 -0000 1.22
+++ Makefile 20 Jul 2007 10:59:51 -0000 1.23
@@ -32,21 +32,21 @@
README.1st \
README.webclient
-.PHONY: all
-all: stage base kolab horde files
+.PHONY: dist
+dist: stage base kolab horde files
stage:
mkdir stage
.PHONY: base
-base:
+base: stage
for PKG in $(BASE_PACKAGES); \
do \
make -C $$PKG dist || exit $?; \
done
.PHONY: kolab
-kolab:
+kolab: stage
cd perl-kolab && make -f Makefile.cvs dist
for PKG in $(KOLAB_PACKAGES); \
do \
@@ -54,7 +54,7 @@
done
.PHONY: horde
-horde:
+horde: stage
for PKG in $(HORDE_PACKAGES); \
do \
make -C $$PKG dist || exit $?; \
@@ -72,4 +72,4 @@
.PHONY: clean
clean:
rm -rf stage
- find . -name "*.src.rpm" -exec rm -f {} \;
\ No newline at end of file
+ find . -name "*.src.rpm" -exec rm -f {} \;
From cvs at kolab.org Fri Jul 20 13:19:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 13:19:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp ChangeLog,1.2,1.3
Message-ID: <20070720111910.6AFC760C4C0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv9341/horde/horde-imp
Modified Files:
ChangeLog
Log Message:
Forgot to update horde changelogs.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 11:19:08 -0000 1.3
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-imp-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-imp-kolab.spec: Update to 20070601
From cvs at kolab.org Fri Jul 20 13:19:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 13:19:10 +0200 (CEST)
Subject: gunnar: server/horde/horde ChangeLog,1.2,1.3
Message-ID: <20070720111910.6412B60C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv9341/horde/horde
Modified Files:
ChangeLog
Log Message:
Forgot to update horde changelogs.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 11:19:08 -0000 1.3
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-kolab.spec: Update to 20070601
From cvs at kolab.org Fri Jul 20 13:19:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 13:19:10 +0200 (CEST)
Subject: gunnar: server Makefile,1.23,1.24
Message-ID: <20070720111910.2210560C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv9341
Modified Files:
Makefile
Log Message:
Forgot to update horde changelogs.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile 20 Jul 2007 10:59:51 -0000 1.23
+++ Makefile 20 Jul 2007 11:19:08 -0000 1.24
@@ -65,7 +65,7 @@
done
.PHONY: files
-files:
+files: stage
cp $(BASE_FILES) stage/
echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
From cvs at kolab.org Fri Jul 20 13:19:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 13:19:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith ChangeLog,1.2,1.3
Message-ID: <20070720111910.733D860C4C6@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv9341/horde/horde-kronolith
Modified Files:
ChangeLog
Log Message:
Forgot to update horde changelogs.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 11:19:08 -0000 1.3
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-kronolith-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-kronolith-kolab.spec: Update to 20070601
From cvs at kolab.org Fri Jul 20 13:19:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 13:19:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo ChangeLog,1.2,1.3
Message-ID: <20070720111910.AFB6C60C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv9341/horde/horde-mnemo
Modified Files:
ChangeLog
Log Message:
Forgot to update horde changelogs.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 11:19:08 -0000 1.3
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-mnemo-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-mnemo-kolab.spec: Update to 20070601
From cvs at kolab.org Fri Jul 20 13:19:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 13:19:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework ChangeLog,1.3,1.4
Message-ID: <20070720111910.675B160C4BF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv9341/horde/horde-framework
Modified Files:
ChangeLog
Log Message:
Forgot to update horde changelogs.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog 31 May 2007 14:31:10 -0000 1.3
+++ ChangeLog 20 Jul 2007 11:19:08 -0000 1.4
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-framework-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-framework-kolab.spec: Update to 20070601
From cvs at kolab.org Fri Jul 20 13:19:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 13:19:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo ChangeLog,1.2,1.3
Message-ID: <20070720111910.6F61160C4C5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv9341/horde/horde-ingo
Modified Files:
ChangeLog
Log Message:
Forgot to update horde changelogs.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 11:19:08 -0000 1.3
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-ingo-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-ingo-kolab.spec: Update to 20070601
From cvs at kolab.org Fri Jul 20 13:19:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 13:19:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag ChangeLog,1.2,1.3
Message-ID: <20070720111910.EF30460C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv9341/horde/horde-nag
Modified Files:
ChangeLog
Log Message:
Forgot to update horde changelogs.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 11:19:08 -0000 1.3
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-nag-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-nag-kolab.spec: Update to 20070601
From cvs at kolab.org Fri Jul 20 13:19:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 13:19:11 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd ChangeLog,1.2,1.3
Message-ID: <20070720111911.3A87060C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv9341/horde/horde-passwd
Modified Files:
ChangeLog
Log Message:
Forgot to update horde changelogs.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 11:19:08 -0000 1.3
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-passwd-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-passwd-kolab.spec: Update to 20070601
From cvs at kolab.org Fri Jul 20 13:19:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 13:19:11 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba ChangeLog,1.3,1.4
Message-ID: <20070720111911.3CE8560C4BF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv9341/horde/horde-turba
Modified Files:
ChangeLog
Log Message:
Forgot to update horde changelogs.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog 31 May 2007 14:31:10 -0000 1.3
+++ ChangeLog 20 Jul 2007 11:19:09 -0000 1.4
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-passwd-kolab.spec: Update to 20070719. Fixed patching.
+
2007-05-31 Gunnar Wrobel
* horde-turba-kolab.spec: Update to 20070601
From cvs at kolab.org Fri Jul 20 17:07:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:48 +0200 (CEST)
Subject: gunnar: server/horde/horde ChangeLog, 1.2, 1.2.2.1 horde-kolab.spec,
1.3, 1.3.2.1
Message-ID: <20070720150748.9E5E460C4A2@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv17810/horde/horde
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-kolab.spec
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 15:07:46 -0000 1.2.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-kolab.spec: Update to 20070601
Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- horde-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-kolab.spec 20 Jul 2007 15:07:46 -0000 1.3.2.1
@@ -2,8 +2,8 @@
%define V_horde_name horde
%define V_package %{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -30,8 +30,15 @@
# 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
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: PEAR-Mail_Mime >= 1.3.1
+PreReq: PEAR-Mail >= 1.1.14
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Fri Jul 20 17:07:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:48 +0200 (CEST)
Subject: gunnar: server Makefile,1.19.2.2,1.19.2.3
Message-ID: <20070720150748.941C060C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv17810
Modified Files:
Tag: kolab_2_1_branch
Makefile
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -d -r1.19.2.2 -r1.19.2.3
--- Makefile 16 Jul 2007 17:41:16 -0000 1.19.2.2
+++ Makefile 20 Jul 2007 15:07:46 -0000 1.19.2.3
@@ -16,29 +16,7 @@
kolab-resource-handlers \
kolab-webadmin \
-BASE_FILES=obmtool \
- obmtool.conf \
- README.1st
-
-.PHONY: dist
-dist:
- rm -rf stage
- mkdir stage
- for PKG in $(BASE_PACKAGES); \
- do \
- make -C $$PKG dist || exit $?; \
- done
- cd perl-kolab && make -f Makefile.cvs dist
- for PKG in $(KOLAB_PACKAGES); \
- do \
- cd $$PKG && make dist || exit $?; cd ..; \
- done
- cp $(BASE_FILES) stage/
- echo 'Remember to update obmtool.conf!'
-
-HORDE_PACKAGES=pear/PEAR-PEAR \
- pear/PEAR-Archive_Tar \
- pear/PEAR-Auth_SASL \
+HORDE_PACKAGES=pear/PEAR-Auth_SASL \
pear/PEAR-Console_Getopt \
pear/PEAR-Date \
pear/PEAR-Log \
@@ -56,20 +34,53 @@
horde/horde-nag \
horde/horde-turba
-.PHONY: dist-horde
-dist-horde:
- rm -rf stage
- mkdir -p stage
- for PKG in $(HORDE_PACKAGES); \
- do \
- make -C $$PKG dist || exit $?; \
- echo -e "\n==" >> stage/ChangeLog; \
- echo "$$PKG" >> stage/ChangeLog; \
- echo -e "==\n" >> stage/ChangeLog; \
- cat $$PKG/ChangeLog >> stage/ChangeLog; \
+BASE_FILES=obmtool \
+ obmtool.conf \
+ README.1st
+
+.PHONY: dist
+dist: stage base kolab files
+
+stage:
+ mkdir stage
+
+.PHONY: base
+bsae: stage
+ for PKG in $(BASE_PACKAGES); \
+ do \
+ make -C $$PKG dist || exit $?; \
+ done
+
+.PHONY: kolab
+kolab: stage
+ cd perl-kolab && make -f Makefile.cvs dist
+ for PKG in $(KOLAB_PACKAGES); \
+ do \
+ cd $$PKG && make dist || exit $?; cd ..; \
+ done
+
+.PHONY: horde
+horde: stage
+ for PKG in pear/PEAR-Structures_Graph pear/PEAR-PEAR pear/PEAR-Archive_Tar;\
+ do \
+ make -C $$PKG dist || exit $?; \
+ /kolab/bin/openpkg rpm -ihv --force --nodeps /kolab/RPM/PKG/$${PKG/pear\//}-*-kolab.rpm; \
+ done
+ for PKG in $(HORDE_PACKAGES); \
+ do \
+ make -C $$PKG dist || exit $?; \
+ echo -e "\n==" >> stage/ChangeLog.horde; \
+ echo "$$PKG" >> stage/ChangeLog.horde; \
+ echo -e "==\n" >> stage/ChangeLog.horde; \
+ cat $$PKG/ChangeLog >> stage/ChangeLog.horde; \
done
cp README.webclient stage/README
cp obmtool-webclient.conf stage/obmtool.conf
+
+.PHONY: files
+files: stage
+ cp $(BASE_FILES) stage/
+ echo 'Remember to update obmtool.conf!'
.PHONY: clean
clean:
From cvs at kolab.org Fri Jul 20 17:07:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:49 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp ChangeLog, 1.2,
1.2.2.1 horde-imp-kolab.spec, 1.4, 1.4.2.1
Message-ID: <20070720150749.EE4C660C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv17810/horde/horde-imp
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-imp-kolab.spec
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 15:07:46 -0000 1.2.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-imp-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-imp-kolab.spec: Update to 20070601
Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- horde-imp-kolab.spec 31 May 2007 14:31:10 -0000 1.4
+++ horde-imp-kolab.spec 20 Jul 2007 15:07:46 -0000 1.4.2.1
@@ -2,8 +2,8 @@
%define V_horde_name imp
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -28,8 +28,14 @@
# 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
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: PEAR-Auth_SASL >= 1.0.2
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Fri Jul 20 17:07:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:48 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo ChangeLog, 1.2,
1.2.2.1 horde-ingo-kolab.spec, 1.3, 1.3.2.1
Message-ID: <20070720150748.F344460C4A2@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv17810/horde/horde-ingo
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-ingo-kolab.spec
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 15:07:46 -0000 1.2.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-ingo-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-ingo-kolab.spec: Update to 20070601
Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- horde-ingo-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-ingo-kolab.spec 20 Jul 2007 15:07:46 -0000 1.3.2.1
@@ -2,8 +2,8 @@
%define V_horde_name ingo
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -28,8 +28,14 @@
# 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
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: PEAR-Net_Sieve >= 1.1.5
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Fri Jul 20 17:07:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:49 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith ChangeLog, 1.2,
1.2.2.1 horde-kronolith-kolab.spec, 1.3, 1.3.2.1
Message-ID: <20070720150749.0C4ED60C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv17810/horde/horde-kronolith
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-kronolith-kolab.spec
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 15:07:46 -0000 1.2.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-kronolith-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-kronolith-kolab.spec: Update to 20070601
Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- horde-kronolith-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-kronolith-kolab.spec 20 Jul 2007 15:07:46 -0000 1.3.2.1
@@ -2,8 +2,8 @@
%define V_horde_name kronolith
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -28,8 +28,13 @@
# 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
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Fri Jul 20 17:07:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:48 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework ChangeLog, 1.3,
1.3.2.1 horde-framework-kolab.spec, 1.5, 1.5.2.1
Message-ID: <20070720150748.AEFD060C4A6@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv17810/horde/horde-framework
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-framework-kolab.spec
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.3
+++ ChangeLog 20 Jul 2007 15:07:46 -0000 1.3.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-framework-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-framework-kolab.spec: Update to 20070601
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- horde-framework-kolab.spec 31 May 2007 14:31:10 -0000 1.5
+++ horde-framework-kolab.spec 20 Jul 2007 15:07:46 -0000 1.5.2.1
@@ -2,8 +2,8 @@
%define V_horde_name framework
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -41,8 +41,12 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: PEAR-PEAR >= 1.4.0
-PreReq: apache >= 1.2.29
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
@@ -72,7 +76,7 @@
rm -rf %{l_prefix}/.pearrc
for PKG in **/package.xml; do \
- if [ "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" ]; then \
+ if [ "$PKG" != "Role_Webroot/package.xml" -a "$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 Jul 20 17:07:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:49 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo ChangeLog, 1.2,
1.2.2.1 horde-mnemo-kolab.spec, 1.3, 1.3.2.1
Message-ID: <20070720150749.0CE8F60C4BF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv17810/horde/horde-mnemo
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-mnemo-kolab.spec
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 15:07:47 -0000 1.2.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-mnemo-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-mnemo-kolab.spec: Update to 20070601
Index: horde-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- horde-mnemo-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-mnemo-kolab.spec 20 Jul 2007 15:07:47 -0000 1.3.2.1
@@ -2,8 +2,8 @@
%define V_horde_name mnemo
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -27,8 +27,14 @@
# 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
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: PEAR-Net_Sieve >= 1.1.5
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Fri Jul 20 17:07:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:49 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-PEAR ChangeLog, 1.1, 1.1.2.1 Makefile, 1.3,
1.3.2.1 PEAR-PEAR.spec, 1.2, 1.2.2.1
Message-ID: <20070720150749.C845660C4C8@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-PEAR
In directory doto:/tmp/cvs-serv17810/pear/PEAR-PEAR
Modified Files:
Tag: kolab_2_1_branch
ChangeLog Makefile PEAR-PEAR.spec
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-PEAR/Attic/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- ChangeLog 29 May 2007 20:34:26 -0000 1.1
+++ ChangeLog 20 Jul 2007 15:07:47 -0000 1.1.2.1
@@ -1,3 +1,10 @@
+2007-07-20 Gunnar Wrobel
+
+ * PEAR-PEAR.spec (BuildPreReq): Fixed PEAR dependency.
+ (Version): Updated to 1.5.4
+
+ * Makefile (VERSION): Updated to 1.5.4
+
2007-05-29 Gunnar Wrobel
* PEAR-PEAR.spec: Added package to Kolab CVS.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-PEAR/Attic/Makefile,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- Makefile 11 Jul 2007 14:38:07 -0000 1.3
+++ Makefile 20 Jul 2007 15:07:47 -0000 1.3.2.1
@@ -1,7 +1,7 @@
RPM = /kolab/bin/openpkg rpm
NAME = PEAR-PEAR
PACKAGE = PEAR-PEAR
-VERSION = 1.4.11
+VERSION = 1.6.1
RELEASE = 1
KOLABRELEASE = $(RELEASE)
Index: PEAR-PEAR.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-PEAR/Attic/PEAR-PEAR.spec,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- PEAR-PEAR.spec 24 May 2007 14:49:40 -0000 1.2
+++ PEAR-PEAR.spec 20 Jul 2007 15:07:47 -0000 1.2.2.1
@@ -3,7 +3,7 @@
Summary: PEAR: PEAR Base System
URL: http://pear.php.net/package/PEAR
Packager: Gunnar Wrobel (p at rdus)
-Version: 1.4.11
+Version: 1.6.1
Release: 1
License: PHP License
Group: Development/Libraries
@@ -15,8 +15,8 @@
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: PEAR-Archive_Tar >= 1.3.2, php
-PreReq: PEAR-Archive_Tar >= 1.3.2, php
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
%description
The PEAR package contains:
@@ -54,17 +54,9 @@
%build
%install
- 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
+ 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
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock}
From cvs at kolab.org Fri Jul 20 17:07:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:49 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag ChangeLog, 1.2,
1.2.2.1 horde-nag-kolab.spec, 1.3, 1.3.2.1
Message-ID: <20070720150749.15BBA60C4C5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv17810/horde/horde-nag
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-nag-kolab.spec
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 15:07:47 -0000 1.2.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-nag-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-nag-kolab.spec: Update to 20070601
Index: horde-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- horde-nag-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-nag-kolab.spec 20 Jul 2007 15:07:47 -0000 1.3.2.1
@@ -2,8 +2,8 @@
%define V_horde_name nag
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -27,8 +27,13 @@
# 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
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Fri Jul 20 17:07:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:49 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba ChangeLog, 1.3,
1.3.2.1 horde-turba-kolab.spec, 1.4,
1.4.2.1 lib-Driver-ldap.php.patch, 1.1,
1.1.2.1 lib-base.php.patch, 1.1, NONE
Message-ID: <20070720150749.B0EB760C4C7@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv17810/horde/horde-turba
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-turba-kolab.spec lib-Driver-ldap.php.patch
Removed Files:
Tag: kolab_2_1_branch
lib-base.php.patch
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.3
+++ ChangeLog 20 Jul 2007 15:07:47 -0000 1.3.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-passwd-kolab.spec: Update to 20070719. Fixed patching.
+
2007-05-31 Gunnar Wrobel
* horde-turba-kolab.spec: Update to 20070601
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- horde-turba-kolab.spec 31 May 2007 14:31:10 -0000 1.4
+++ horde-turba-kolab.spec 20 Jul 2007 15:07:47 -0000 1.4.2.1
@@ -2,8 +2,8 @@
%define V_horde_name turba
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -32,7 +32,8 @@
#
# The second part of the patch allows to rename
# shares
-Patch0: lib-Turba.php.patch
+#Patch0: lib-Turba.php.patch
+# FIXME: Disabled for now.
##################################################
# PATCH COMMENT
@@ -40,22 +41,19 @@
# 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
+Patch0: config-sources.php.dist.patch
+Patch1: lib-Driver-ldap.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
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
@@ -81,8 +79,7 @@
cd %{V_horde_name}
%patch -p0 -P 0
%patch -p0 -P 1
- %patch -p0 -P 2
- %patch -p0 -P 3
+# %patch -p0 -P 2
cd ..
%build
Index: lib-Driver-ldap.php.patch
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/lib-Driver-ldap.php.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- lib-Driver-ldap.php.patch 25 May 2007 12:07:17 -0000 1.1
+++ lib-Driver-ldap.php.patch 20 Jul 2007 15:07:47 -0000 1.1.2.1
@@ -4,7 +4,7 @@
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
++++ lib/Driver/ldap.php 18 Jun 2007 15:15:15 -0000
@@ -54,6 +54,9 @@
if (empty($params['deref'])) {
$params['deref'] = LDAP_DEREF_NEVER;
@@ -29,7 +29,7 @@
+ */
+ function hasPermission($perm)
+ {
-+ if ($this->usingShares || $this->_params['read_only'] === false) {
++ if ($this->_params['read_only'] === false) {
+ return parent::hasPermission($perm);
+ } else {
+ switch ($perm) {
--- lib-base.php.patch DELETED ---
From cvs at kolab.org Fri Jul 20 17:07:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:07:49 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd ChangeLog, 1.2,
1.2.2.1 horde-passwd-kolab.spec, 1.3, 1.3.2.1
Message-ID: <20070720150749.1A9C160C4C6@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv17810/horde/horde-passwd
Modified Files:
Tag: kolab_2_1_branch
ChangeLog horde-passwd-kolab.spec
Log Message:
Update the Makefile so that the horde packages build on an installed 2.1 machine.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ChangeLog 31 May 2007 14:31:10 -0000 1.2
+++ ChangeLog 20 Jul 2007 15:07:47 -0000 1.2.2.1
@@ -1,3 +1,7 @@
+2007-07-19 Gunnar Wrobel
+
+ * horde-passwd-kolab.spec: Update to 20070719
+
2007-05-31 Gunnar Wrobel
* horde-passwd-kolab.spec: Update to 20070601
Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- horde-passwd-kolab.spec 31 May 2007 14:31:10 -0000 1.3
+++ horde-passwd-kolab.spec 20 Jul 2007 15:07:47 -0000 1.3.2.1
@@ -2,8 +2,8 @@
%define V_horde_name passwd
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 06
-%define V_day 01
+%define V_month 07
+%define V_day 19
%define V_version %{V_year}%{V_month}%{V_day}
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release 1
@@ -27,8 +27,13 @@
# 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
+
+#Pre requisites
+
+BuildPreReq: php, php::with_pear = yes
+PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= %{V_version}
+
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Fri Jul 20 17:09:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:09:02 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Structures_Graph - New directory
Message-ID: <20070720150902.B948E60C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Structures_Graph
In directory doto:/tmp/cvs-serv17977/PEAR-Structures_Graph
Log Message:
Directory /kolabrepository/server/pear/PEAR-Structures_Graph added to the repository
--> Using per-directory sticky tag `kolab_2_1_branch'
From cvs at kolab.org Fri Jul 20 17:10:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 17:10:05 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Structures_Graph ChangeLog, NONE,
1.1.2.1 Makefile, NONE, 1.1.2.1 PEAR-Structures_Graph.spec, NONE,
1.1.2.1
Message-ID: <20070720151005.111CA60C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Structures_Graph
In directory doto:/tmp/cvs-serv18006/PEAR-Structures_Graph
Added Files:
Tag: kolab_2_1_branch
ChangeLog Makefile PEAR-Structures_Graph.spec
Log Message:
Additional package PEAR-Structures_Graph that is necessary to get the newer PEAR-* packages built.
--- NEW FILE: ChangeLog ---
2007-07-20 Gunnar Wrobel
* PEAR-Structures_Graph.spec: Added package to Kolab CVS.
--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
NAME = PEAR-Structures_Graph
PACKAGE = PEAR-Structures_Graph
VERSION = 1.0.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/Structures_Graph-$(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
dist: all
cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
binary:
$(RPM) -bB $(PACKAGE).spec
--- NEW FILE: PEAR-Structures_Graph.spec ---
# Package Information
Name: PEAR-Structures_Graph
Summary: Graph datastructure manipulation library
URL: http://pear.php.net/package/Structures_Graph
Packager: Gunnar Wrobel (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/Structures_Graph-%{version}.tgz
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
%description
Structures_Graph is a package for creating and manipulating graph
datastructures. It allows building of directed and undirected graphs,
with data and metadata stored in nodes. The library provides functions
for graph traversing as well as for characteristic extraction from the
graph topology.
%prep
%setup -n Structures_Graph-%{version}
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Structures_Graph-%{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
From cvs at kolab.org Fri Jul 20 18:29:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 18:29:48 +0200 (CEST)
Subject: gunnar: server Makefile, 1.19.2.3, 1.19.2.4 obmtool-webclient.conf,
1.5, 1.5.2.1
Message-ID: <20070720162948.0B0DD60C4A2@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv19773
Modified Files:
Tag: kolab_2_1_branch
Makefile obmtool-webclient.conf
Log Message:
Fixed a typo and added horde to the default tasks.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -d -r1.19.2.3 -r1.19.2.4
--- Makefile 20 Jul 2007 15:07:46 -0000 1.19.2.3
+++ Makefile 20 Jul 2007 16:29:45 -0000 1.19.2.4
@@ -34,18 +34,20 @@
horde/horde-nag \
horde/horde-turba
-BASE_FILES=obmtool \
- obmtool.conf \
+BASE_FILES=obmtool \
+ obmtool.conf \
+ obmtool-webclient.conf \
+ README.webclient \
README.1st
.PHONY: dist
-dist: stage base kolab files
+dist: stage base kolab horde files
stage:
mkdir stage
.PHONY: base
-bsae: stage
+base: stage
for PKG in $(BASE_PACKAGES); \
do \
make -C $$PKG dist || exit $?; \
@@ -74,8 +76,6 @@
echo -e "==\n" >> stage/ChangeLog.horde; \
cat $$PKG/ChangeLog >> stage/ChangeLog.horde; \
done
- cp README.webclient stage/README
- cp obmtool-webclient.conf stage/obmtool.conf
.PHONY: files
files: stage
Index: obmtool-webclient.conf
===================================================================
RCS file: /kolabrepository/server/obmtool-webclient.conf,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- obmtool-webclient.conf 1 Jun 2007 15:16:32 -0000 1.5
+++ obmtool-webclient.conf 20 Jul 2007 16:29:45 -0000 1.5.2.1
@@ -163,7 +163,8 @@
@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
+ @forcein ${altloc}PEAR-Structures_Graph-1.0.2-1
+ @forcein ${altloc}PEAR-PEAR-1.6.1-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
@@ -171,15 +172,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-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
+ @install ${altloc}horde-framework-kolab-20070719-1
+ @install ${altloc}horde-kolab-20070719-1
+ @install ${altloc}horde-imp-kolab-20070719-1
+ @install ${altloc}horde-ingo-kolab-20070719-1
+ @install ${altloc}horde-kronolith-kolab-20070719-1
+ @install ${altloc}horde-mnemo-kolab-20070719-1
+ @install ${altloc}horde-nag-kolab-20070719-1
+ @install ${altloc}horde-passwd-kolab-20070719-1
+ @install ${altloc}horde-turba-kolab-20070719-1
@check
if test ! -e "/usr/bin/kolab" ; then
From cvs at kolab.org Fri Jul 20 18:37:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 18:37:01 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/dist_conf kolab,1.42,1.42.2.1
Message-ID: <20070720163701.D87CB60C4A2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv19995/kolabd/kolabd/dist_conf
Modified Files:
Tag: kolab_2_1_branch
kolab
Log Message:
Make changing user names easier for dist_conf/kolab (see kolab/issue1862)
Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -u -d -r1.42 -r1.42.2.1
--- kolab 11 Feb 2007 14:47:51 -0000 1.42
+++ kolab 20 Jul 2007 16:36:59 -0000 1.42.2.1
@@ -38,11 +38,11 @@
amavisd_logfile=${localstatedir}/amavisd/amavisd.log
amavisd_home=${localstatedir}/amavisd
# @l_rusr@
-amavisd_rusr=kolab-r
+amavisd_rusr=${kolab_rusr}
# @l_musr@
-amavisd_usr=kolab
+amavisd_usr=${kolab_musr}
# @l_rgrp@
-amavisd_grp=kolab-r
+amavisd_grp=${kolab_rgrp}
amavisd_rpm=amavisd
@@ -56,31 +56,31 @@
freshclam_logfile=${localstatedir}/clamav/freshclam.log
freshclam_pidfile=${sysrundir}/freshclam.pid
# @l_rusr@
-clamav_rusr=kolab-r
+clamav_rusr=${kolab_rusr}
# @l_musr@
-clamav_usr=kolab
+clamav_usr=${kolab_musr}
# @l_rgrp@
-clamav_grp=kolab-r
+clamav_grp=${kolab_rgrp}
# @l_musr@
# @l_rgrp@
-emailscan_usr=kolab-r
-emailscan_grp=kolab-r
+emailscan_usr=${kolab_rusr}
+emailscan_grp=${kolab_rgrp}
emailserver_confdir=${sysconfdir}/postfix
emailserver_socket=${localstatedir}/kolab/lmtp
emailserver_localstatedir=${localstatedir}/postfix
emailserver_logfile=${emailserver_localstatedir}/log/postfix.log
emailserver_usr=${kolab_usr}
-emailserver_musr=kolab
-emailserver_grp=kolab-r
+emailserver_musr=${kolab_musr}
+emailserver_grp=${kolab_rgrp}
# @l_musr@
-emailserver_mail_owner=kolab
-emailserver_setgid_grp=kolab-r
-emailserver_default_privs=kolab-n
-emailserver_master_usr=kolab-n
+emailserver_mail_owner=${kolab_musr}
+emailserver_setgid_grp=${kolab_rgrp}
+emailserver_default_privs=${kolab_usr}
+emailserver_master_usr=${kolab_usr}
emailserver_rpm=postfix
emailserver_tables_usr=root
@@ -88,7 +88,7 @@
ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
ftpserver_confdir=${sysconfdir}/proftpd
ftpserver_pidfile=${localstatedir}/proftpd/proftpd.pid
-ftpserver_musr=kolab
+ftpserver_musr=${kolab_musr}
ftpserver_usr=${kolab_usr}
ftpserver_grp=${kolab_grp}
# Why hardcoded uid/gid???
@@ -98,9 +98,9 @@
imap_confdir=${sysconfdir}/imapd
imap_confperm=0640
# @l_musr@
-imap_usr=kolab
+imap_usr=${kolab_musr}
# @l_rgrp@
-imap_grp=kolab-r
+imap_grp=${kolab_rgrp}
imap_masterlogfile=${localstatedir}/imapd/log/master.log
imap_misclogfile=${localstatedir}/imapd/log/misc.log
imap_statedir=${localstatedir}/imapd
@@ -136,11 +136,11 @@
ldapserver_schemadir=${sysconfdir}/openldap/schema
ldapserver_confdir=${sysconfdir}/openldap
# @l_musr@
-ldapserver_usr=kolab
+ldapserver_usr=${kolab_musr}
# @l_mgrp@
-ldapserver_grp=kolab
-ldapserver_rgrp=kolab-r
-ldapserver_rusr=kolab
+ldapserver_grp=${kolab_mgrp}
+ldapserver_rgrp=${kolab_rgrp}
+ldapserver_rusr=${kolab_musr}
webserver_document_root=${localstatedir}/kolab/www
webserver_cgidir=${webserver_document_root}/cgi-bin
@@ -158,7 +158,7 @@
webserver_sslmutex=${webserver_logdir}/ssl_mutex
# webserver_web_prefix is empty indeed
webserver_web_prefix=
-webserver_musr=kolab
+webserver_musr=${kolab_musr}
webserver_usr=${kolab_usr}
webserver_grp=${kolab_grp}
webserver_rpm=apache
@@ -181,15 +181,15 @@
resmgr_filterdir=${localstatedir}/resmgr/filter
resmgr_scriptsdir=${resmgr_confdir}
# @l_musr@
-resmgr_usr=kolab
+resmgr_usr=${kolab_musr}
# @l_ngrp@
-resmgr_grp=kolab-n
+resmgr_grp=${kolab_grp}
fbview_logfile=${localstatedir}/resmgr/fbview.log
freebusy_logfile=${localstatedir}/resmgr/freebusy.log
freebusy_cachedir=${webserver_document_root}/freebusy/cache
-freebusy_usr=kolab
-freebusy_grp=kolab-n
+freebusy_usr=${kolab_musr}
+freebusy_grp=${kolab_grp}
graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
From cvs at kolab.org Fri Jul 20 18:53:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 18:53:14 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/dist_conf kolab,1.43,1.44
Message-ID: <20070720165314.4FE9E60C4A2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv20337/kolabd/kolabd/dist_conf
Modified Files:
kolab
Log Message:
Make changing user names easier for dist_conf/kolab (see kolab/issue1862)
Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- kolab 17 Jul 2007 15:07:15 -0000 1.43
+++ kolab 20 Jul 2007 16:53:12 -0000 1.44
@@ -38,11 +38,11 @@
amavisd_logfile=${localstatedir}/amavisd/amavisd.log
amavisd_home=${localstatedir}/amavisd
# @l_rusr@
-amavisd_rusr=kolab-r
+amavisd_rusr=${kolab_rusr}
# @l_musr@
-amavisd_usr=kolab
+amavisd_usr=${kolab_musr}
# @l_rgrp@
-amavisd_grp=kolab-r
+amavisd_grp=${kolab_rgrp}
amavisd_rpm=amavisd
@@ -56,31 +56,31 @@
freshclam_logfile=${localstatedir}/clamav/freshclam.log
freshclam_pidfile=${sysrundir}/freshclam.pid
# @l_rusr@
-clamav_rusr=kolab-r
+clamav_rusr=${kolab_rusr}
# @l_musr@
-clamav_usr=kolab
+clamav_usr=${kolab_musr}
# @l_rgrp@
-clamav_grp=kolab-r
+clamav_grp=${kolab_rgrp}
# @l_musr@
# @l_rgrp@
-emailscan_usr=kolab-r
-emailscan_grp=kolab-r
+emailscan_usr=${kolab_rusr}
+emailscan_grp=${kolab_rgrp}
emailserver_confdir=${sysconfdir}/postfix
emailserver_socket=${localstatedir}/kolab/lmtp
emailserver_localstatedir=${localstatedir}/postfix
emailserver_logfile=${emailserver_localstatedir}/log/postfix.log
emailserver_usr=${kolab_usr}
-emailserver_musr=kolab
-emailserver_grp=kolab-r
+emailserver_musr=${kolab_musr}
+emailserver_grp=${kolab_rgrp}
# @l_musr@
-emailserver_mail_owner=kolab
-emailserver_setgid_grp=kolab-r
-emailserver_default_privs=kolab-n
-emailserver_master_usr=kolab-n
+emailserver_mail_owner=${kolab_musr}
+emailserver_setgid_grp=${kolab_rgrp}
+emailserver_default_privs=${kolab_usr}
+emailserver_master_usr=${kolab_usr}
emailserver_rpm=postfix
emailserver_tables_usr=root
@@ -88,7 +88,7 @@
ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
ftpserver_confdir=${sysconfdir}/proftpd
ftpserver_pidfile=${localstatedir}/proftpd/proftpd.pid
-ftpserver_musr=kolab
+ftpserver_musr=${kolab_musr}
ftpserver_usr=${kolab_usr}
ftpserver_grp=${kolab_grp}
# Why hardcoded uid/gid???
@@ -98,9 +98,9 @@
imap_confdir=${sysconfdir}/imapd
imap_confperm=0640
# @l_musr@
-imap_usr=kolab
+imap_usr=${kolab_musr}
# @l_rgrp@
-imap_grp=kolab-r
+imap_grp=${kolab_rgrp}
imap_masterlogfile=${localstatedir}/imapd/log/master.log
imap_misclogfile=${localstatedir}/imapd/log/misc.log
imap_statedir=${localstatedir}/imapd
@@ -136,11 +136,11 @@
ldapserver_schemadir=${sysconfdir}/openldap/schema
ldapserver_confdir=${sysconfdir}/openldap
# @l_musr@
-ldapserver_usr=kolab
+ldapserver_usr=${kolab_musr}
# @l_mgrp@
-ldapserver_grp=kolab
-ldapserver_rgrp=kolab-r
-ldapserver_rusr=kolab
+ldapserver_grp=${kolab_mgrp}
+ldapserver_rgrp=${kolab_rgrp}
+ldapserver_rusr=${kolab_musr}
webserver_document_root=${localstatedir}/kolab/www
webserver_cgidir=${webserver_document_root}/cgi-bin
@@ -158,7 +158,7 @@
webserver_sslmutex=${webserver_logdir}/ssl_mutex
# webserver_web_prefix is empty indeed
webserver_web_prefix=
-webserver_musr=kolab
+webserver_musr=${kolab_musr}
webserver_usr=${kolab_usr}
webserver_grp=${kolab_grp}
webserver_rpm=apache2
@@ -181,15 +181,15 @@
resmgr_filterdir=${localstatedir}/resmgr/filter
resmgr_scriptsdir=${resmgr_confdir}
# @l_musr@
-resmgr_usr=kolab
+resmgr_usr=${kolab_musr}
# @l_ngrp@
-resmgr_grp=kolab-n
+resmgr_grp=${kolab_grp}
fbview_logfile=${localstatedir}/resmgr/fbview.log
freebusy_logfile=${localstatedir}/resmgr/freebusy.log
freebusy_cachedir=${webserver_document_root}/freebusy/cache
-freebusy_usr=kolab
-freebusy_grp=kolab-n
+freebusy_usr=${kolab_musr}
+freebusy_grp=${kolab_grp}
graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
From cvs at kolab.org Fri Jul 20 22:14:54 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 22:14:54 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/dist_conf kolab,1.44,1.45
Message-ID: <20070720201454.7737760C4A2@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv24524/kolabd/kolabd/dist_conf
Modified Files:
kolab
Log Message:
Fix kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- kolab 20 Jul 2007 16:53:12 -0000 1.44
+++ kolab 20 Jul 2007 20:14:52 -0000 1.45
@@ -1,22 +1,3 @@
-# @l_nusr@
-kolab_usr=kolab-n
-# @l_ngrp@
-kolab_grp=kolab-n
-# @l_musr@
-kolab_musr=kolab
-# @l_mgrp@
-kolab_mgrp=kolab
-# @l_nuid@
-kolab_uid=1002
-# @l_ngid@
-kolab_gid=1002
-# @l_rusr@
-kolab_rusr=kolab-r
-# @l_rgrp@
-kolab_rgrp=kolab-r
-# @l_susr@
-kolab_susr=root
-
BASHELL=${libdir}/openpkg/bash
PERL=${bindir}/perl
PHP=${bindir}/php
@@ -24,6 +5,16 @@
RPM=${KOLABRC} rpm
TAR=${libdir}/openpkg/tar
+kolab_usr:=$(shell $(RPM) --eval %{l_nusr})
+kolab_grp:=$(shell $(RPM) --eval %{l_ngrp})
+kolab_musr:=$(shell $(RPM) --eval %{l_musr})
+kolab_mgrp:=$(shell $(RPM) --eval %{l_mgrp})
+kolab_uid:=$(shell $(RPM) --eval %{l_nuid})
+kolab_gid:=$(shell $(RPM) --eval %{l_ngid})
+kolab_rusr:=$(shell $(RPM) --eval %{l_rusr})
+kolab_rgrp:=$(shell $(RPM) --eval %{l_rgrp})
+kolab_susr:=$(shell $(RPM) --eval %{l_susr})
+
# Define the deamons that are executed with openpkg rc
LDAPD=openldap
@@ -82,7 +73,7 @@
emailserver_default_privs=${kolab_usr}
emailserver_master_usr=${kolab_usr}
emailserver_rpm=postfix
-emailserver_tables_usr=root
+emailserver_tables_usr=${kolab_susr}
ftpserver_scoreboardfile=${localstatedir}/proftpd/score
ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
From cvs at kolab.org Fri Jul 20 22:14:54 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 22:14:54 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.133,1.134
Message-ID: <20070720201454.72A5C60C4A1@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24524
Modified Files:
release-notes.txt
Log Message:
Fix kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- release-notes.txt 19 Jul 2007 16:47:57 -0000 1.133
+++ release-notes.txt 20 Jul 2007 20:14:52 -0000 1.134
@@ -41,6 +41,7 @@
Added missing Makefile dependencies
kolab/issue1679 (Update template META mechanism to support service restarts)
+ kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
- kolabd-2.1.0-2007????
@@ -55,6 +56,7 @@
kolab/issue1693 (Automatically trigger f/b cache regeneration)
kolab/issue1804 (Several files apparently missing in kolabd 2.1.0 package)
kolab/issue1861 (imapd.conf.template: primary domain listed twice in loginrealms)
+ kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
- kolab-resource-handlers-2.1.0-2007????
@@ -63,6 +65,7 @@
Added missing Makefile dependencies
kolab/issue1693 (Automatically trigger f/b cache regeneration)
+ kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
- kolab-webadmin-2.1.0-2007????
@@ -81,6 +84,7 @@
kolab/issue1781 (Spanish PO File Translation)
kolab/issue1797 (kolab-webadmin source package missing PO files)
kolab/issue1845 (incorrect check mailForDn for ldap results)
+ kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
Changes between 2.1-rc-2 and 2.1.0:
From cvs at kolab.org Fri Jul 20 22:15:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 22:15:01 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/dist_conf kolab,1.42.2.1,1.42.2.2
Message-ID: <20070720201501.0D1FF60C4C5@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv24550/kolabd/kolabd/dist_conf
Modified Files:
Tag: kolab_2_1_branch
kolab
Log Message:
Fix kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
diff -u -d -r1.42.2.1 -r1.42.2.2
--- kolab 20 Jul 2007 16:36:59 -0000 1.42.2.1
+++ kolab 20 Jul 2007 20:14:59 -0000 1.42.2.2
@@ -1,22 +1,3 @@
-# @l_nusr@
-kolab_usr=kolab-n
-# @l_ngrp@
-kolab_grp=kolab-n
-# @l_musr@
-kolab_musr=kolab
-# @l_mgrp@
-kolab_mgrp=kolab
-# @l_nuid@
-kolab_uid=1002
-# @l_ngid@
-kolab_gid=1002
-# @l_rusr@
-kolab_rusr=kolab-r
-# @l_rgrp@
-kolab_rgrp=kolab-r
-# @l_susr@
-kolab_susr=root
-
BASHELL=${libdir}/openpkg/bash
PERL=${bindir}/perl
PHP=${bindir}/php
@@ -24,6 +5,16 @@
RPM=${KOLABRC} rpm
TAR=${libdir}/openpkg/tar
+kolab_usr:=$(shell $(RPM) --eval %{l_nusr})
+kolab_grp:=$(shell $(RPM) --eval %{l_ngrp})
+kolab_musr:=$(shell $(RPM) --eval %{l_musr})
+kolab_mgrp:=$(shell $(RPM) --eval %{l_mgrp})
+kolab_uid:=$(shell $(RPM) --eval %{l_nuid})
+kolab_gid:=$(shell $(RPM) --eval %{l_ngid})
+kolab_rusr:=$(shell $(RPM) --eval %{l_rusr})
+kolab_rgrp:=$(shell $(RPM) --eval %{l_rgrp})
+kolab_susr:=$(shell $(RPM) --eval %{l_susr})
+
# Define the deamons that are executed with openpkg rc
LDAPD=openldap
@@ -82,7 +73,7 @@
emailserver_default_privs=${kolab_usr}
emailserver_master_usr=${kolab_usr}
emailserver_rpm=postfix
-emailserver_tables_usr=root
+emailserver_tables_usr=${kolab_susr}
ftpserver_scoreboardfile=${localstatedir}/proftpd/score
ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
From cvs at kolab.org Fri Jul 20 22:15:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Jul 2007 22:15:01 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.131.2.2,1.131.2.3
Message-ID: <20070720201501.0ABC760C4C0@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24550
Modified Files:
Tag: kolab_2_1_branch
release-notes.txt
Log Message:
Fix kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.131.2.2
retrieving revision 1.131.2.3
diff -u -d -r1.131.2.2 -r1.131.2.3
--- release-notes.txt 19 Jul 2007 16:47:47 -0000 1.131.2.2
+++ release-notes.txt 20 Jul 2007 20:14:58 -0000 1.131.2.3
@@ -41,6 +41,7 @@
Added missing Makefile dependencies
kolab/issue1679 (Update template META mechanism to support service restarts)
+ kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
- kolabd-2.1.0-2007????
@@ -55,6 +56,7 @@
kolab/issue1693 (Automatically trigger f/b cache regeneration)
kolab/issue1804 (Several files apparently missing in kolabd 2.1.0 package)
kolab/issue1861 (imapd.conf.template: primary domain listed twice in loginrealms)
+ kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
- kolab-resource-handlers-2.1.0-2007????
@@ -63,6 +65,7 @@
Added missing Makefile dependencies
kolab/issue1693 (Automatically trigger f/b cache regeneration)
+ kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
- kolab-webadmin-2.1.0-2007????
@@ -81,6 +84,7 @@
kolab/issue1781 (Spanish PO File Translation)
kolab/issue1797 (kolab-webadmin source package missing PO files)
kolab/issue1845 (incorrect check mailForDn for ldap results)
+ kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
Changes between 2.1-rc-2 and 2.1.0:
From cvs at kolab.org Mon Jul 23 16:36:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 16:36:22 +0200 (CEST)
Subject: gunnar: server obmtool-webclient.conf,1.5.2.1,1.5.2.2
Message-ID: <20070723143622.60E9060C4CE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv14020
Modified Files:
Tag: kolab_2_1_branch
obmtool-webclient.conf
Log Message:
Commit the url fix for the webmail obmtool.conf.
Index: obmtool-webclient.conf
===================================================================
RCS file: /kolabrepository/server/obmtool-webclient.conf,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- obmtool-webclient.conf 20 Jul 2007 16:29:45 -0000 1.5.2.1
+++ obmtool-webclient.conf 23 Jul 2007 14:36:20 -0000 1.5.2.2
@@ -18,7 +18,7 @@
opt=`echo "${opt}" | sed -e 's;=.*$;;'`
case $opt in
-u|--user) USERNAME="$arg";;
- --url) URL="$arg";;
+ --url) URL="";;
esac
done
@@ -26,9 +26,9 @@
echo "---- boot/build ${NODE} %${CMD} ----"
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 development files in the host system
From cvs at kolab.org Mon Jul 23 17:13:09 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 17:13:09 +0200 (CEST)
Subject: gunnar: server/horde/horde-kolab-client - New directory
Message-ID: <20070723151309.CF96960C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kolab-client
In directory doto:/tmp/cvs-serv14840/horde-kolab-client
Log Message:
Directory /kolabrepository/server/horde/horde-kolab-client added to the repository
From cvs at kolab.org Mon Jul 23 17:14:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 17:14:23 +0200 (CEST)
Subject: gunnar: server/horde/horde-kolab-client ChangeLog, NONE, 1.1 Makefile,
NONE, 1.1 horde-kolab-client.spec, NONE, 1.1
Message-ID: <20070723151423.1E20960C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kolab-client
In directory doto:/tmp/cvs-serv14914/horde-kolab-client
Added Files:
ChangeLog Makefile horde-kolab-client.spec
Log Message:
Adding a draft version of the combined horde-kolab-client pacakge.
--- NEW FILE: ChangeLog ---
2007-07-23 Gunnar Wrobel
* horde-kolab-client.spec: Added package to Kolab CVS.
--- NEW FILE: Makefile ---
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
KOLABRPMPKG = /kolab/RPM/PKG
endif
RPM = /kolab/bin/openpkg rpm
PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([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}
VERSION = ${YEAR}${MONTH}${DAY}
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
.PHONY: dist
dist: all
cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
.PHONY: clean
clean:
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
--- NEW FILE: horde-kolab-client.spec ---
# Versions
%define V_package horde-kolab-client
%define V_year 2007
%define V_month 07
%define V_day 19
%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: A wrapper package definition to install all horde packages
URL: http://www.horde.org/
Packager: Gunnar Wrobel (p at rdus)
Version: %{V_version}
Release: %{V_release}
Class: JUNK
License: GPL
Group: MAIL
Distribution: OpenPKG
# List of Sources
# This package has no sources
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
#Pre requisites
PreReq: horde-framework-kolab >= %{V_version}
PreReq: horde-kolab >= %{V_version}
PreReq: horde-imp-kolab >= %{V_version}
PreReq: horde-ingo-kolab >= %{V_version}
PreReq: horde-kronolith-kolab >= %{V_version}
PreReq: horde-mnemo-kolab >= %{V_version}
PreReq: horde-nag-kolab >= %{V_version}
PreReq: horde-passwd-kolab >= %{V_version}
PreReq: horde-turba-kolab >= %{V_version}
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
%description
This wrapper package simply requires all horde packages that are
currently necessary for installing Horde on a Kolab server
%prep
%build
%install
%clean
%files
From cvs at kolab.org Mon Jul 23 18:06:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:45 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo Makefile, 1.2,
1.3 horde-mnemo-kolab.spec, 1.4, 1.5
Message-ID: <20070723160645.6F3BB60C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv16960/horde/horde-mnemo
Modified Files:
Makefile horde-mnemo-kolab.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 11 Jul 2007 14:38:07 -0000 1.2
+++ Makefile 23 Jul 2007 16:06:43 -0000 1.3
@@ -1,4 +1,12 @@
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
+
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/")
@@ -14,15 +22,23 @@
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:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
@@ -51,8 +67,4 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: horde-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-mnemo-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
+++ horde-mnemo-kolab.spec 23 Jul 2007 16:06:43 -0000 1.5
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 07
-%define V_day 19
+%define V_day 23
%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 Mon Jul 23 18:06:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:45 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba Makefile, 1.2,
1.3 horde-turba-kolab.spec, 1.5, 1.6
Message-ID: <20070723160645.B8F3F60C4CE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv16960/horde/horde-turba
Modified Files:
Makefile horde-turba-kolab.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 11 Jul 2007 14:38:07 -0000 1.2
+++ Makefile 23 Jul 2007 16:06:43 -0000 1.3
@@ -1,4 +1,12 @@
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
+
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/")
@@ -14,15 +22,23 @@
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:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
@@ -51,8 +67,4 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-turba-kolab.spec 19 Jul 2007 15:56:22 -0000 1.5
+++ horde-turba-kolab.spec 23 Jul 2007 16:06:43 -0000 1.6
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 07
-%define V_day 19
+%define V_day 23
%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 Mon Jul 23 18:06:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:45 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag Makefile, 1.2, 1.3 horde-nag-kolab.spec,
1.4, 1.5
Message-ID: <20070723160645.ADC0E60C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv16960/horde/horde-nag
Modified Files:
Makefile horde-nag-kolab.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 11 Jul 2007 14:38:07 -0000 1.2
+++ Makefile 23 Jul 2007 16:06:43 -0000 1.3
@@ -1,4 +1,12 @@
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
+
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/")
@@ -14,15 +22,23 @@
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:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
@@ -51,8 +67,4 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: horde-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-nag-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
+++ horde-nag-kolab.spec 23 Jul 2007 16:06:43 -0000 1.5
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 07
-%define V_day 19
+%define V_day 23
%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 Mon Jul 23 18:06:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:45 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd Makefile, 1.2,
1.3 horde-passwd-kolab.spec, 1.4, 1.5
Message-ID: <20070723160645.B431860C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv16960/horde/horde-passwd
Modified Files:
Makefile horde-passwd-kolab.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 11 Jul 2007 14:38:07 -0000 1.2
+++ Makefile 23 Jul 2007 16:06:43 -0000 1.3
@@ -1,4 +1,12 @@
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
+
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/")
@@ -14,15 +22,23 @@
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:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
@@ -51,8 +67,4 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-passwd-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
+++ horde-passwd-kolab.spec 23 Jul 2007 16:06:43 -0000 1.5
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 07
-%define V_day 19
+%define V_day 23
%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 Mon Jul 23 18:06:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:45 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Archive_Tar Makefile, 1.3,
1.4 PEAR-Archive_Tar.spec, 1.3, 1.4
Message-ID: <20070723160645.E961760C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv16960/pear/PEAR-Archive_Tar
Modified Files:
Makefile PEAR-Archive_Tar.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Archive_Tar/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 11 Jul 2007 14:38:07 -0000 1.3
+++ Makefile 23 Jul 2007 16:06:43 -0000 1.4
@@ -1,26 +1,37 @@
-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
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
-# Remove once moving to kolab cvs
-SOURCE_0=http://pear.php.net/get/Archive_Tar-$(VERSION).tgz
+RPM = /kolab/bin/openpkg rpm
-all:
+PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
+PACKAGE = PEAR-$(PEAR_NAME)
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: PEAR-Archive_Tar.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Archive_Tar/PEAR-Archive_Tar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PEAR-Archive_Tar.spec 19 Jul 2007 15:55:23 -0000 1.3
+++ PEAR-Archive_Tar.spec 23 Jul 2007 16:06:43 -0000 1.4
@@ -1,16 +1,22 @@
+# Variables
+%define V_pear_name Archive_Tar
+%define V_package PEAR-%{V_pear_name}
+%define V_version 1.3.2
+%define V_release 1
+
# Package Information
-Name: PEAR-Archive_Tar
+Name: %{V_package}
Summary: PEAR: Tar file management class
-URL: http://pear.php.net/package/PEAR
+URL: http://pear.php.net/package/%{V_pear_name}
Packager: Gunnar Wrobel (p at rdus)
-Version: 1.3.2
-Release: 1
+Version: %{V_version}
+Release: %{V_release}
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
-Source: http://pear.php.net/get/Archive_Tar-%{version}.tgz
+Source: http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
# Build Info
Prefix: %{l_prefix}
@@ -29,14 +35,14 @@
loaded. Bz2 compression is also supported with the bz2 extension loaded.
%prep
- %setup -n Archive_Tar-%{version}
+ %setup -n %{V_pear_name}-%{V_version}
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Archive_Tar-%{version}.tgz
+ %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_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}
From cvs at kolab.org Mon Jul 23 18:06:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Auth_SASL Makefile, 1.3,
1.4 PEAR-Auth_SASL.spec, 1.3, 1.4
Message-ID: <20070723160646.0555260C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv16960/pear/PEAR-Auth_SASL
Modified Files:
Makefile PEAR-Auth_SASL.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 11 Jul 2007 14:38:07 -0000 1.3
+++ Makefile 23 Jul 2007 16:06:43 -0000 1.4
@@ -1,27 +1,37 @@
-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
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
-# Remove once moving to kolab cvs
-SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
+RPM = /kolab/bin/openpkg rpm
-all:
+PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
+PACKAGE = PEAR-$(PEAR_NAME)
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: PEAR-Auth_SASL.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/PEAR-Auth_SASL.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PEAR-Auth_SASL.spec 19 Jul 2007 15:55:23 -0000 1.3
+++ PEAR-Auth_SASL.spec 23 Jul 2007 16:06:43 -0000 1.4
@@ -1,19 +1,22 @@
-# Defines
-%define package_name Auth_SASL
+# Variables
+%define V_pear_name Auth_SASL
+%define V_package PEAR-%{V_pear_name}
+%define V_version 1.0.2
+%define V_release 1
# Package Information
-Name: PEAR-%{package_name}
+Name: %{V_package}
Summary: PEAR: Abstraction of various SASL mechanism responses
-URL: http://pear.php.net/package/%{package_name}
+URL: http://pear.php.net/package/%{V_pear_name}
Packager: Gunnar Wrobel (p at rdus)
-Version: 1.0.2
-Release: 1
+Version: %{V_version}
+Release: %{V_release}
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
-Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
+Source: http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
# Build Info
Prefix: %{l_prefix}
@@ -34,14 +37,14 @@
o Login (Pseudo mechanism)
%prep
- %setup -n %{package_name}-%{version}
+ %setup -n %{V_pear_name}-%{V_version}
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
+ %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_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}
From cvs at kolab.org Mon Jul 23 18:06:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Date Makefile, 1.3, 1.4 PEAR-Date.spec, 1.3,
1.4
Message-ID: <20070723160646.8443560C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Date
In directory doto:/tmp/cvs-serv16960/pear/PEAR-Date
Modified Files:
Makefile PEAR-Date.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 11 Jul 2007 14:38:07 -0000 1.3
+++ Makefile 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,27 +1,37 @@
-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
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
-# Remove once moving to kolab cvs
-SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
+RPM = /kolab/bin/openpkg rpm
-all:
+PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
+PACKAGE = PEAR-$(PEAR_NAME)
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: PEAR-Date.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/PEAR-Date.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PEAR-Date.spec 19 Jul 2007 15:55:24 -0000 1.3
+++ PEAR-Date.spec 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,19 +1,22 @@
-# Defines
-%define package_name Date
+# Variables
+%define V_pear_name Date
+%define V_package PEAR-%{V_pear_name}
+%define V_version 1.4.7
+%define V_release 1
# Package Information
-Name: PEAR-%{package_name}
+Name: %{V_package}
Summary: PEAR: Generic date/time handling class for PEAR
-URL: http://pear.php.net/package/%{package_name}
+URL: http://pear.php.net/package/%{V_pear_name}
Packager: Gunnar Wrobel (p at rdus)
-Version: 1.4.7
-Release: 1
+Version: %{V_version}
+Release: %{V_release}
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
-Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
+Source: http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
# Build Info
Prefix: %{l_prefix}
@@ -36,14 +39,14 @@
to convert date strings between Gregorian and Human calendar formats.
%prep
- %setup -n %{package_name}-%{version}
+ %setup -n %{V_pear_name}-%{V_version}
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
+ %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_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}
From cvs at kolab.org Mon Jul 23 18:06:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Console_Getopt Makefile, 1.3,
1.4 PEAR-Console_Getopt.spec, 1.3, 1.4
Message-ID: <20070723160646.44C3060C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv16960/pear/PEAR-Console_Getopt
Modified Files:
Makefile PEAR-Console_Getopt.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Console_Getopt/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 11 Jul 2007 14:38:07 -0000 1.3
+++ Makefile 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,26 +1,37 @@
-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
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
-# Remove once moving to kolab cvs
-SOURCE_0=http://pear.php.net/get/Console_Getopt-$(VERSION).tgz
+RPM = /kolab/bin/openpkg rpm
-all:
+PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
+PACKAGE = PEAR-$(PEAR_NAME)
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: PEAR-Console_Getopt.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Console_Getopt/PEAR-Console_Getopt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PEAR-Console_Getopt.spec 19 Jul 2007 15:55:23 -0000 1.3
+++ PEAR-Console_Getopt.spec 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,16 +1,22 @@
+# Variables
+%define V_pear_name Console_Getopt
+%define V_package PEAR-%{V_pear_name}
+%define V_version 1.2.1
+%define V_release 1
+
# Package Information
-Name: PEAR-Console_Getopt
+Name: %{V_package}
Summary: PEAR: Command-line option parser
-URL: http://pear.php.net/package/PEAR
+URL: http://pear.php.net/package/%{V_pear_name}
Packager: Gunnar Wrobel (p at rdus)
-Version: 1.2.1
-Release: 1
+Version: %{V_version}
+Release: %{V_release}
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
-Source: http://pear.php.net/get/Console_Getopt-%{version}.tgz
+Source: http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
# Build Info
Prefix: %{l_prefix}
@@ -27,14 +33,14 @@
short and long options.
%prep
- %setup -n Console_Getopt-%{version}
+ %setup -n %{V_pear_name}-%{V_version}
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Console_Getopt-%{version}.tgz
+ %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock}
From cvs at kolab.org Mon Jul 23 18:06:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Log Makefile,1.3,1.4 PEAR-Log.spec,1.3,1.4
Message-ID: <20070723160646.873C560C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv16960/pear/PEAR-Log
Modified Files:
Makefile PEAR-Log.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 11 Jul 2007 14:38:07 -0000 1.3
+++ Makefile 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,26 +1,37 @@
-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
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
-# Remove once moving to kolab cvs
-SOURCE_0=http://pear.php.net/get/Log-$(VERSION).tgz
+RPM = /kolab/bin/openpkg rpm
-all:
+PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
+PACKAGE = PEAR-$(PEAR_NAME)
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: PEAR-Log.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/PEAR-Log.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PEAR-Log.spec 19 Jul 2007 15:55:24 -0000 1.3
+++ PEAR-Log.spec 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,19 +1,22 @@
-# Defines
-%define package_name Log
+# Variables
+%define V_pear_name Log
+%define V_package PEAR-%{V_pear_name}
+%define V_version 1.9.9
+%define V_release 1
# Package Information
-Name: PEAR-%{package_name}
+Name: %{V_package}
Summary: PEAR: Logging utilities
URL: http://pear.php.net/package/%{package_name}
Packager: Gunnar Wrobel (p at rdus)
-Version: 1.9.9
-Release: 1
+Version: %{V_version}
+Release: %{V_release}
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
-Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
+Source: http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
# Build Info
Prefix: %{l_prefix}
@@ -31,14 +34,14 @@
also provides a subject - observer mechanism.
%prep
- %setup -n %{package_name}-%{version}
+ %setup -n %{V_pear_name}-%{V_version}
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
+ %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 18:06:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail Makefile, 1.3, 1.4 PEAR-Mail.spec, 1.3,
1.4
Message-ID: <20070723160646.8A46560C4CE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail
In directory doto:/tmp/cvs-serv16960/pear/PEAR-Mail
Modified Files:
Makefile PEAR-Mail.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 11 Jul 2007 14:38:07 -0000 1.3
+++ Makefile 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,26 +1,37 @@
-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
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
-# Remove once moving to kolab cvs
-SOURCE_0=http://pear.php.net/get/Mail-$(VERSION).tgz
+RPM = /kolab/bin/openpkg rpm
-all:
+PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
+PACKAGE = PEAR-$(PEAR_NAME)
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: PEAR-Mail.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/PEAR-Mail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PEAR-Mail.spec 19 Jul 2007 15:55:24 -0000 1.3
+++ PEAR-Mail.spec 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,19 +1,22 @@
-# Defines
-%define package_name Mail
+# Variables
+%define V_pear_name Mail
+%define V_package PEAR-%{V_pear_name}
+%define V_version 1.1.14
+%define V_release 1
# Package Information
-Name: PEAR-%{package_name}
+Name: %{V_package}
Summary: PEAR: Class that provides multiple interfaces for sending emails
-URL: http://pear.php.net/package/%{package_name}
+URL: http://pear.php.net/package/%{V_pear_name}
Packager: Gunnar Wrobel (p at rdus)
-Version: 1.1.14
-Release: 1
+Version: %{V_version}
+Release: %{V_release}
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
-Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
+Source: http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
# Build Info
Prefix: %{l_prefix}
@@ -33,14 +36,14 @@
email address list validation utility class.
%prep
- %setup -n %{package_name}-%{version}
+ %setup -n %{V_pear_name}-%{V_version}
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
+ %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 18:06:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail_Mime Makefile, 1.3,
1.4 PEAR-Mail_Mime.spec, 1.3, 1.4
Message-ID: <20070723160646.9120860C4CF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv16960/pear/PEAR-Mail_Mime
Modified Files:
Makefile PEAR-Mail_Mime.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail_Mime/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 11 Jul 2007 14:38:07 -0000 1.3
+++ Makefile 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,27 +1,37 @@
-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
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
-# Remove once moving to kolab cvs
-SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
+RPM = /kolab/bin/openpkg rpm
-all:
+PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
+PACKAGE = PEAR-$(PEAR_NAME)
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: PEAR-Mail_Mime.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail_Mime/PEAR-Mail_Mime.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PEAR-Mail_Mime.spec 19 Jul 2007 15:55:24 -0000 1.3
+++ PEAR-Mail_Mime.spec 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,19 +1,22 @@
-# Defines
-%define package_name Mail_Mime
+# Variables
+%define V_pear_name Mail_Mime
+%define V_package PEAR-%{V_pear_name}
+%define V_version 1.3.1
+%define V_release 1
# Package Information
-Name: PEAR-%{package_name}
+Name: %{V_package}
Summary: PEAR: Provides classes to create and decode mime messages.
URL: http://pear.php.net/package/%{package_name}
Packager: Gunnar Wrobel (p at rdus)
-Version: 1.3.1
-Release: 1
+Version: %{V_version}
+Release: %{V_release}
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
-Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
+Source: http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
# Build Info
Prefix: %{l_prefix}
@@ -29,14 +32,14 @@
Provides classes to deal with creation and manipulation of mime messages.
%prep
- %setup -n %{package_name}-%{version}
+ %setup -n %{V_pear_name}-%{V_version}
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
+ %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 18:06:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Socket Makefile, 1.3,
1.4 PEAR-Net_Socket.spec, 1.3, 1.4
Message-ID: <20070723160646.D262360C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv16960/pear/PEAR-Net_Socket
Modified Files:
Makefile PEAR-Net_Socket.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 11 Jul 2007 14:38:07 -0000 1.3
+++ Makefile 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,27 +1,37 @@
-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
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
-# Remove once moving to kolab cvs
-SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
+RPM = /kolab/bin/openpkg rpm
-all:
+PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
+PACKAGE = PEAR-$(PEAR_NAME)
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: PEAR-Net_Socket.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/PEAR-Net_Socket.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PEAR-Net_Socket.spec 19 Jul 2007 15:55:24 -0000 1.3
+++ PEAR-Net_Socket.spec 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,19 +1,22 @@
-# Defines
-%define package_name Net_Socket
+# Variables
+%define V_pear_name Net_Socket
+%define V_package PEAR-%{V_pear_name}
+%define V_version 1.0.6
+%define V_release 1
# Package Information
-Name: PEAR-%{package_name}
+Name: %{V_package}
Summary: PEAR: Network Socket Interface
-URL: http://pear.php.net/package/%{package_name}
+URL: http://pear.php.net/package/%{V_pear_name}
Packager: Gunnar Wrobel (p at rdus)
-Version: 1.0.6
-Release: 1
+Version: %{V_version}
+Release: %{V_release}
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
-Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
+Source: http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
# Build Info
Prefix: %{l_prefix}
@@ -33,14 +36,14 @@
%prep
- %setup -n %{package_name}-%{version}
+ %setup -n %{V_pear_name}-%{V_version}
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
+ %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_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}
From cvs at kolab.org Mon Jul 23 18:06:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:06:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Sieve Makefile, 1.3,
1.4 PEAR-Net_Sieve.spec, 1.3, 1.4
Message-ID: <20070723160646.C08EB60C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv16960/pear/PEAR-Net_Sieve
Modified Files:
Makefile PEAR-Net_Sieve.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Sieve/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 11 Jul 2007 14:38:07 -0000 1.3
+++ Makefile 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,27 +1,37 @@
-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
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
-# Remove once moving to kolab cvs
-SOURCE_0=http://pear.php.net/get/$(PNAME)-$(VERSION).tgz
+RPM = /kolab/bin/openpkg rpm
-all:
+PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
+PACKAGE = PEAR-$(PEAR_NAME)
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: PEAR-Net_Sieve.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Sieve/PEAR-Net_Sieve.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PEAR-Net_Sieve.spec 19 Jul 2007 15:55:24 -0000 1.3
+++ PEAR-Net_Sieve.spec 23 Jul 2007 16:06:44 -0000 1.4
@@ -1,19 +1,22 @@
-# Defines
-%define package_name Net_Sieve
+# Variables
+%define V_pear_name Net_Sieve
+%define V_package PEAR-%{V_pear_name}
+%define V_version 1.1.5
+%define V_release 1
# Package Information
-Name: PEAR-%{package_name}
+Name: %{V_package}
Summary: PEAR: Handles talking to timsieved
-URL: http://pear.php.net/package/%{package_name}
+URL: http://pear.php.net/package/%{V_pear_name}
Packager: Gunnar Wrobel (p at rdus)
-Version: 1.1.5
-Release: 1
+Version: %{V_version}
+Release: %{V_release}
License: PHP License
Group: Development/Libraries
Distribution: OpenPKG
# List of Sources
-Source: http://pear.php.net/get/%{package_name}-%{version}.tgz
+Source: http://pear.php.net/get/%{V_pear_name}-%{V_version}.tgz
# Build Info
Prefix: %{l_prefix}
@@ -32,14 +35,14 @@
sieve scripts.
%prep
- %setup -n %{package_name}-%{version}
+ %setup -n %{V_pear_name}-%{V_version}
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{package_name}-%{version}.tgz
+ %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 18:07:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:07:14 +0200 (CEST)
Subject: gunnar: server Makefile,1.24,1.25
Message-ID: <20070723160714.9574C60C4DB@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv16960
Modified Files:
Makefile
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile 20 Jul 2007 11:19:08 -0000 1.24
+++ Makefile 23 Jul 2007 16:06:42 -0000 1.25
@@ -24,7 +24,8 @@
horde/horde-kronolith \
horde/horde-mnemo \
horde/horde-nag \
- horde/horde-turba
+ horde/horde-turba \
+ horde/horde-kolab-client
BASE_FILES=install-kolab.sh \
00INDEX.rdf \
@@ -73,3 +74,15 @@
clean:
rm -rf stage
find . -name "*.src.rpm" -exec rm -f {} \;
+
+.PHONY: clean
+clean: clean-horde
+ rm -rf stage
+ find . -name "*.src.rpm" -exec rm -f {} \;
+
+.PHONY: clean-horde
+clean-horde:
+ for PKG in $(HORDE_PACKAGES); \
+ do \
+ make -C $$PKG clean || exit $?; \
+ done
From cvs at kolab.org Mon Jul 23 18:07:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:07:14 +0200 (CEST)
Subject: gunnar: server/horde/horde Makefile, 1.10, 1.11 horde-kolab.spec, 1.4,
1.5
Message-ID: <20070723160714.D888860C4DB@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv16960/horde/horde
Modified Files:
Makefile horde-kolab.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile 11 Jul 2007 14:38:06 -0000 1.10
+++ Makefile 23 Jul 2007 16:06:42 -0000 1.11
@@ -1,4 +1,12 @@
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
+
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/")
@@ -14,15 +22,23 @@
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:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
@@ -51,8 +67,4 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
+++ horde-kolab.spec 23 Jul 2007 16:06:42 -0000 1.5
@@ -3,7 +3,7 @@
%define V_package %{V_horde_name}-kolab
%define V_year 2007
%define V_month 07
-%define V_day 19
+%define V_day 23
%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 Mon Jul 23 18:07:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:07:14 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework Makefile, 1.4,
1.5 horde-framework-kolab.spec, 1.6, 1.7
Message-ID: <20070723160714.DAFFB60C4DC@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv16960/horde/horde-framework
Modified Files:
Makefile horde-framework-kolab.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 11 Jul 2007 14:38:06 -0000 1.4
+++ Makefile 23 Jul 2007 16:06:42 -0000 1.5
@@ -1,4 +1,12 @@
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
+
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/")
@@ -14,15 +22,23 @@
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:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
@@ -51,8 +67,4 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- horde-framework-kolab.spec 19 Jul 2007 15:56:22 -0000 1.6
+++ horde-framework-kolab.spec 23 Jul 2007 16:06:42 -0000 1.7
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 07
-%define V_day 19
+%define V_day 23
%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 Mon Jul 23 18:07:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:07:14 +0200 (CEST)
Subject: gunnar: server/horde/horde-kolab-client horde-kolab-client.spec, 1.1,
1.2
Message-ID: <20070723160714.E564A60C4DF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kolab-client
In directory doto:/tmp/cvs-serv16960/horde/horde-kolab-client
Modified Files:
horde-kolab-client.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: horde-kolab-client.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kolab-client/horde-kolab-client.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-kolab-client.spec 23 Jul 2007 15:14:21 -0000 1.1
+++ horde-kolab-client.spec 23 Jul 2007 16:06:42 -0000 1.2
@@ -2,7 +2,7 @@
%define V_package horde-kolab-client
%define V_year 2007
%define V_month 07
-%define V_day 19
+%define V_day 23
%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 Mon Jul 23 18:07:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:07:14 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp Makefile, 1.2, 1.3 horde-imp-kolab.spec,
1.5, 1.6
Message-ID: <20070723160714.DFC1060C4DD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv16960/horde/horde-imp
Modified Files:
Makefile horde-imp-kolab.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 11 Jul 2007 14:38:06 -0000 1.2
+++ Makefile 23 Jul 2007 16:06:42 -0000 1.3
@@ -1,4 +1,12 @@
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
+
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/")
@@ -14,15 +22,23 @@
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:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
@@ -51,8 +67,4 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-imp-kolab.spec 19 Jul 2007 15:56:22 -0000 1.5
+++ horde-imp-kolab.spec 23 Jul 2007 16:06:42 -0000 1.6
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 07
-%define V_day 19
+%define V_day 23
%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 Mon Jul 23 18:07:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:07:14 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith Makefile, 1.2,
1.3 horde-kronolith-kolab.spec, 1.4, 1.5
Message-ID: <20070723160714.EA6656184A0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv16960/horde/horde-kronolith
Modified Files:
Makefile horde-kronolith-kolab.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 11 Jul 2007 14:38:07 -0000 1.2
+++ Makefile 23 Jul 2007 16:06:42 -0000 1.3
@@ -1,4 +1,12 @@
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
+
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/")
@@ -14,15 +22,23 @@
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:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
@@ -51,8 +67,4 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-kronolith-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
+++ horde-kronolith-kolab.spec 23 Jul 2007 16:06:42 -0000 1.5
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 07
-%define V_day 19
+%define V_day 23
%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 Mon Jul 23 18:07:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 18:07:14 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo Makefile, 1.2,
1.3 horde-ingo-kolab.spec, 1.4, 1.5
Message-ID: <20070723160714.E343660C4DE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv16960/horde/horde-ingo
Modified Files:
Makefile horde-ingo-kolab.spec
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 11 Jul 2007 14:38:06 -0000 1.2
+++ Makefile 23 Jul 2007 16:06:42 -0000 1.3
@@ -1,4 +1,12 @@
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
+
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/")
@@ -14,15 +22,23 @@
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:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+ rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
@@ -51,8 +67,4 @@
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-ingo-kolab.spec 19 Jul 2007 15:56:22 -0000 1.4
+++ horde-ingo-kolab.spec 23 Jul 2007 16:06:42 -0000 1.5
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 07
-%define V_day 19
+%define V_day 23
%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 Mon Jul 23 19:23:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 19:23:23 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Archive_Tar Makefile, 1.4,
1.5 PEAR-Archive_Tar.spec, 1.4, 1.5
Message-ID: <20070723172323.2FF0A60C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv19001/pear/PEAR-Archive_Tar
Modified Files:
Makefile PEAR-Archive_Tar.spec
Log Message:
The newer php-5.* package allows a sane PEAR-package installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Archive_Tar/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 23 Jul 2007 16:06:43 -0000 1.4
+++ Makefile 23 Jul 2007 17:23:21 -0000 1.5
@@ -23,6 +23,7 @@
.PHONY: clean
clean:
+ rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
Index: PEAR-Archive_Tar.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Archive_Tar/PEAR-Archive_Tar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PEAR-Archive_Tar.spec 23 Jul 2007 16:06:43 -0000 1.4
+++ PEAR-Archive_Tar.spec 23 Jul 2007 17:23:21 -0000 1.5
@@ -42,8 +42,8 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock}
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 19:23:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 19:23:23 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Auth_SASL Makefile, 1.4,
1.5 PEAR-Auth_SASL.spec, 1.4, 1.5
Message-ID: <20070723172323.6DBFB60C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv19001/pear/PEAR-Auth_SASL
Modified Files:
Makefile PEAR-Auth_SASL.spec
Log Message:
The newer php-5.* package allows a sane PEAR-package installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 23 Jul 2007 16:06:43 -0000 1.4
+++ Makefile 23 Jul 2007 17:23:21 -0000 1.5
@@ -23,6 +23,7 @@
.PHONY: clean
clean:
+ rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
Index: PEAR-Auth_SASL.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/PEAR-Auth_SASL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PEAR-Auth_SASL.spec 23 Jul 2007 16:06:43 -0000 1.4
+++ PEAR-Auth_SASL.spec 23 Jul 2007 17:23:21 -0000 1.5
@@ -44,8 +44,8 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels}
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 19:23:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 19:23:23 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Console_Getopt Makefile, 1.4,
1.5 PEAR-Console_Getopt.spec, 1.4, 1.5
Message-ID: <20070723172323.AD42A60C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv19001/pear/PEAR-Console_Getopt
Modified Files:
Makefile PEAR-Console_Getopt.spec
Log Message:
The newer php-5.* package allows a sane PEAR-package installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Console_Getopt/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 23 Jul 2007 16:06:44 -0000 1.4
+++ Makefile 23 Jul 2007 17:23:21 -0000 1.5
@@ -23,6 +23,7 @@
.PHONY: clean
clean:
+ rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
Index: PEAR-Console_Getopt.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Console_Getopt/PEAR-Console_Getopt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PEAR-Console_Getopt.spec 23 Jul 2007 16:06:44 -0000 1.4
+++ PEAR-Console_Getopt.spec 23 Jul 2007 17:23:21 -0000 1.5
@@ -40,9 +40,8 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock}
-
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 19:23:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 19:23:23 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Log Makefile,1.4,1.5 PEAR-Log.spec,1.4,1.5
Message-ID: <20070723172323.B649C60C4CE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv19001/pear/PEAR-Log
Modified Files:
Makefile PEAR-Log.spec
Log Message:
The newer php-5.* package allows a sane PEAR-package installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 23 Jul 2007 16:06:44 -0000 1.4
+++ Makefile 23 Jul 2007 17:23:21 -0000 1.5
@@ -23,6 +23,7 @@
.PHONY: clean
clean:
+ rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
Index: PEAR-Log.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/PEAR-Log.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PEAR-Log.spec 23 Jul 2007 16:06:44 -0000 1.4
+++ PEAR-Log.spec 23 Jul 2007 17:23:21 -0000 1.5
@@ -41,8 +41,8 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 19:23:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 19:23:23 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Sieve Makefile, 1.4,
1.5 PEAR-Net_Sieve.spec, 1.4, 1.5
Message-ID: <20070723172323.C280360C4D1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv19001/pear/PEAR-Net_Sieve
Modified Files:
Makefile PEAR-Net_Sieve.spec
Log Message:
The newer php-5.* package allows a sane PEAR-package installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Sieve/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 23 Jul 2007 16:06:44 -0000 1.4
+++ Makefile 23 Jul 2007 17:23:21 -0000 1.5
@@ -23,6 +23,7 @@
.PHONY: clean
clean:
+ rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
Index: PEAR-Net_Sieve.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Sieve/PEAR-Net_Sieve.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PEAR-Net_Sieve.spec 23 Jul 2007 16:06:44 -0000 1.4
+++ PEAR-Net_Sieve.spec 23 Jul 2007 17:23:21 -0000 1.5
@@ -42,8 +42,8 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 19:23:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 19:23:23 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Date Makefile, 1.4, 1.5 PEAR-Date.spec, 1.4,
1.5
Message-ID: <20070723172323.B1A3E60C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Date
In directory doto:/tmp/cvs-serv19001/pear/PEAR-Date
Modified Files:
Makefile PEAR-Date.spec
Log Message:
The newer php-5.* package allows a sane PEAR-package installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 23 Jul 2007 16:06:44 -0000 1.4
+++ Makefile 23 Jul 2007 17:23:21 -0000 1.5
@@ -23,6 +23,7 @@
.PHONY: clean
clean:
+ rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
Index: PEAR-Date.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/PEAR-Date.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PEAR-Date.spec 23 Jul 2007 16:06:44 -0000 1.4
+++ PEAR-Date.spec 23 Jul 2007 17:23:21 -0000 1.5
@@ -46,8 +46,8 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels}
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 19:23:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 19:23:23 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail Makefile, 1.4, 1.5 PEAR-Mail.spec, 1.4,
1.5
Message-ID: <20070723172323.BAE1C60C4CF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail
In directory doto:/tmp/cvs-serv19001/pear/PEAR-Mail
Modified Files:
Makefile PEAR-Mail.spec
Log Message:
The newer php-5.* package allows a sane PEAR-package installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 23 Jul 2007 16:06:44 -0000 1.4
+++ Makefile 23 Jul 2007 17:23:21 -0000 1.5
@@ -23,6 +23,7 @@
.PHONY: clean
clean:
+ rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
Index: PEAR-Mail.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/PEAR-Mail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PEAR-Mail.spec 23 Jul 2007 16:06:44 -0000 1.4
+++ PEAR-Mail.spec 23 Jul 2007 17:23:21 -0000 1.5
@@ -43,8 +43,8 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 19:23:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 19:23:23 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail_Mime Makefile, 1.4,
1.5 PEAR-Mail_Mime.spec, 1.4, 1.5
Message-ID: <20070723172323.E361B60C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv19001/pear/PEAR-Mail_Mime
Modified Files:
Makefile PEAR-Mail_Mime.spec
Log Message:
The newer php-5.* package allows a sane PEAR-package installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail_Mime/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 23 Jul 2007 16:06:44 -0000 1.4
+++ Makefile 23 Jul 2007 17:23:21 -0000 1.5
@@ -23,6 +23,7 @@
.PHONY: clean
clean:
+ rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
Index: PEAR-Mail_Mime.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail_Mime/PEAR-Mail_Mime.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PEAR-Mail_Mime.spec 23 Jul 2007 16:06:44 -0000 1.4
+++ PEAR-Mail_Mime.spec 23 Jul 2007 17:23:21 -0000 1.5
@@ -39,8 +39,8 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb}
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Mon Jul 23 19:23:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Jul 2007 19:23:24 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Socket Makefile, 1.4,
1.5 PEAR-Net_Socket.spec, 1.4, 1.5
Message-ID: <20070723172324.4439360C4BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv19001/pear/PEAR-Net_Socket
Modified Files:
Makefile PEAR-Net_Socket.spec
Log Message:
The newer php-5.* package allows a sane PEAR-package installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 23 Jul 2007 16:06:44 -0000 1.4
+++ Makefile 23 Jul 2007 17:23:21 -0000 1.5
@@ -23,6 +23,7 @@
.PHONY: clean
clean:
+ rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
Index: PEAR-Net_Socket.spec
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/PEAR-Net_Socket.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PEAR-Net_Socket.spec 23 Jul 2007 16:06:44 -0000 1.4
+++ PEAR-Net_Socket.spec 23 Jul 2007 17:23:21 -0000 1.5
@@ -43,8 +43,8 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --nodeps -R $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
- rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels}
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_pear_name}-%{V_version}.tgz
+ rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
From cvs at kolab.org Tue Jul 24 12:29:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Jul 2007 12:29:12 +0200 (CEST)
Subject: thomas: server/clamav Makefile, 1.4.2.1, 1.4.2.2 kolab.patch, 1.5,
1.5.2.1
Message-ID: <20070724102912.5BDCD60C4D0@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/clamav
In directory doto:/tmp/cvs-serv16141/clamav
Modified Files:
Tag: kolab_2_1_branch
Makefile kolab.patch
Log Message:
Updated clamav package
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Attic/Makefile,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- Makefile 16 Jul 2007 17:29:13 -0000 1.4.2.1
+++ Makefile 24 Jul 2007 10:29:10 -0000 1.4.2.2
@@ -12,9 +12,9 @@
endif
PACKAGE=clamav
-VERSION=0.90.3
-RELEASE=20070531
-KOLABRELEASE=20070531_kolab
+VERSION=0.91.1
+RELEASE=20070718
+KOLABRELEASE=20070718_kolab
RPM=/kolab/bin/openpkg rpm
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/clamav/Attic/kolab.patch,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- kolab.patch 1 Jun 2007 15:42:41 -0000 1.5
+++ kolab.patch 24 Jul 2007 10:29:10 -0000 1.5.2.1
@@ -3,9 +3,9 @@
@@ -33,7 +33,7 @@ Class: EVAL
Group: AntiVirus
License: GPL
- Version: 0.90.3
--Release: 20070531
-+Release: 20070531_kolab
+ Version: 0.91.1
+-Release: 20070718
++Release: 20070718_kolab
# package options
%option with_milter no
From cvs at kolab.org Tue Jul 24 12:29:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Jul 2007 12:29:12 +0200 (CEST)
Subject: thomas: server obmtool.conf, 1.256, 1.256.2.1 release-notes.txt,
1.131.2.3, 1.131.2.4
Message-ID: <20070724102912.5A38960C4CF@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv16141
Modified Files:
Tag: kolab_2_1_branch
obmtool.conf release-notes.txt
Log Message:
Updated clamav package
Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/Attic/obmtool.conf,v
retrieving revision 1.256
retrieving revision 1.256.2.1
diff -u -d -r1.256 -r1.256.2.1
--- obmtool.conf 5 Jun 2007 10:16:59 -0000 1.256
+++ obmtool.conf 24 Jul 2007 10:29:09 -0000 1.256.2.1
@@ -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.3-20070531_kolab
+ @install ${altloc}clamav-0.91.1-20070718_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.131.2.3
retrieving revision 1.131.2.4
diff -u -d -r1.131.2.3 -r1.131.2.4
--- release-notes.txt 20 Jul 2007 20:14:58 -0000 1.131.2.3
+++ release-notes.txt 24 Jul 2007 10:29:09 -0000 1.131.2.4
@@ -32,7 +32,7 @@
Changes between 2.1.0 and 2.1.???:
- - clamav-0.90.3-20070531_kolab
+ - clamav-0.91.1-20070718_kolab
New upstream version, fixes various security issues.
From cvs at kolab.org Tue Jul 24 13:12:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Jul 2007 13:12:05 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.119,1.120
Message-ID: <20070724111205.70DE4600174@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv17399
Modified Files:
index.html.m4
Log Message:
Kolab Security Issue 16 20070724 (clamav)
Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- index.html.m4 1 Jun 2007 16:21:29 -0000 1.119
+++ index.html.m4 24 Jul 2007 11:12:03 -0000 1.120
@@ -48,6 +48,21 @@
+July 24nd, 2007
+»
+ Security Issue 16 for Kolab Server (ClamAV)
+
+
+
+ Metaeye Security Group discovered that ClamAV crashes due to processing of
+ standard filters in RAR VM, while processing a corrupted RAR file.
+ A new ClamAV RPM with a fix is available. See the
+
Kolab Security Issue 16 for details.
+
+
+
+
+
June 1st, 2007
»
Security Issue 15 for Kolab Server (ClamAV)
From cvs at kolab.org Tue Jul 24 13:12:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Jul 2007 13:12:05 +0200 (CEST)
Subject: thomas: doc/www/src/security kolab-vendor-notice-16.txt,NONE,1.1
Message-ID: <20070724111205.AD8BE600174@lists.intevation.de>
Author: thomas
Update of /kolabrepository/doc/www/src/security
In directory doto:/tmp/cvs-serv17399/security
Added Files:
kolab-vendor-notice-16.txt
Log Message:
Kolab Security Issue 16 20070724 (clamav)
--- NEW FILE: kolab-vendor-notice-16.txt ---
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Kolab Security Issue 16 20070724
================================
Package: Kolab Server, ClamAV
Vulnerability: denial of service
Kolab Specific: no
Dependent Packages: none
Summary
~~~~~~~
CVE-2007-3725
Metaeye Security Group discovered that ClamAV crashes due to processing of
standard filters in RAR VM, while processing a corrupted RAR file.
Kolab servers use the clamd daemon for filtering. While Kolab Server 2.0
passes following mails without being scanned by ClamAV, Kolab Server 2.1
falls back to using the command line clamscan utility which significantly
increases processing overhead.
Affected Versions
~~~~~~~~~~~~~~~~~
This affects versions of ClamAV up to version 0.90.3.
Kolab Server 2.1.0 and previous releases of the 2.1 branch are affected.
Kolab Server 2.0.4 and previous releases of the 2.0 branch are affected.
Kolab Server 2.2-beta1 is affected.
Fix
~~~
Upgrade to ClamAV 0.91.1.
The ClamAV source RPM is available from the Kolab download mirrors as:
security-updates/20070724/clamav-0.91.1-20070718_kolab.src.rpm
A binary RPM for Kolab Server 2.1.0 (ix86 Debian GNU/Linux Sarge) is available:
security-updates/20070724/clamav-0.91.1-20070718_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/20070724/clamav-0.91.1-20070718_kolab.src.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20070724/clamav-0.91.1-20070718_kolab.ix86-debian3.1-kolab.rpm .
MD5 sums:
4ed62987a0871b0d6ab7520e85fc3a25 clamav-0.91.1-20070718_kolab.src.rpm
aebbcde54deb366b0f7966f4c947b1de clamav-0.91.1-20070718_kolab.ix86-debian3.1-kolab.rpm
The package can be installed on your Kolab Server with
# /kolab/bin/openpkg rpm --rebuild clamav-0.91.1-20070718_kolab.src.rpm
# /kolab/bin/openpkg rpm \
-Uvh /kolab/RPM/PKG/clamav-0.91.1-20070718_kolab.--kolab.rpm
# rm /kolab/etc/clamav/clamd.conf.rpmsave
# /kolab/bin/openpkg rc clamav restart
# su - kolab-r
$ freshclam
For Kolab Server 2.0.4 you have to copy the new /kolab/etc/clamav/clamd.conf
to /kolab/etc/kolab/templates/clamd.conf.template so it will not be
overwritten by kolabconf. Do NOT copy this file with Kolab Server 2.1 or 2.2!
Details
~~~~~~~
http://sourceforge.net/project/shownotes.php?release_id=522414
ClamAV 0.91 release notes
http://sourceforge.net/project/shownotes.php?release_id=523634
ClamAV 0.91.1 release notes
http://www.securityfocus.com/bid/24866
Multiple Vendors RAR Handling Remote Null Pointer Dereference Vulnerability
(CVE-2007-3725)
http://www.metaeye.org/advisories/54
Metaeye Security Group: Advisory and proof of concept file.
Timeline
~~~~~~~~
20070711 ClamAV release 0.91.
20070711 OpenPKG 0.91 package release.
20070716 ClamAV release 0.91.1.
20070718 OpenPKG 0.91.1 package release.
20070724 Kolab Server security advisory published.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFGpd1eW7P1GVgWeRoRAtQ8AJ4i1X2oP3n7uLY2IjOftP3/XEWuVwCgmJeI
2IFz/NljqvK4Xq/6JShCiAQ=
=okQi
-----END PGP SIGNATURE-----
From cvs at kolab.org Tue Jul 24 19:08:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Jul 2007 19:08:16 +0200 (CEST)
Subject: schreiber: doc/www/src index.html.m4,1.120,1.121
Message-ID: <20070724170816.EBDF5600173@lists.intevation.de>
Author: schreiber
Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv26582/src
Modified Files:
index.html.m4
Log Message:
fixed date ordinal
Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- index.html.m4 24 Jul 2007 11:12:03 -0000 1.120
+++ index.html.m4 24 Jul 2007 17:08:14 -0000 1.121
@@ -48,7 +48,7 @@
-July 24nd, 2007
+July 24th, 2007
»
Security Issue 16 for Kolab Server (ClamAV)
From cvs at kolab.org Thu Jul 26 10:42:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 10:42:35 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.100,1.101
Message-ID: <20070726084235.DBBBB60C4A5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv28062/d/kolabd
Modified Files:
ChangeLog
Log Message:
Added discard service to the postfix master.cf configuration.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- ChangeLog 27 Jun 2007 12:08:32 -0000 1.100
+++ ChangeLog 26 Jul 2007 08:42:33 -0000 1.101
@@ -1,3 +1,12 @@
+2007-07-26 Gunnar Wrobel
+
+ * templates/master.cf.template.in:
+
+ A Gentoo user notified me of missing services in the Gentoo
+ postfix configuration. I checked the Kolab-Server-2.2 postfix
+ configuration and "postfix upgrade-configuration" adds a missing
+ "discard" service. Added to the template.
+
2007-06-27 Marcus Hüwe
* dist_conf/suse:
From cvs at kolab.org Thu Jul 26 10:42:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 10:42:35 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.134,1.135
Message-ID: <20070726084235.DA1F0600174@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv28062
Modified Files:
release-notes.txt
Log Message:
Added discard service to the postfix master.cf configuration.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- release-notes.txt 20 Jul 2007 20:14:52 -0000 1.134
+++ release-notes.txt 26 Jul 2007 08:42:33 -0000 1.135
@@ -30,6 +30,13 @@
upstream versions.
+Changes between 2.2-beta-1 and 2.2-???:
+
+ - kolabd-2.1.99-2007????:
+
+ Added "discard" service to the postfix master.cf configuration.
+
+
Changes between 2.1.0 and 2.1.???:
- clamav-0.90.3-20070531_kolab
From cvs at kolab.org Thu Jul 26 10:42:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 10:42:35 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates master.cf.template.in, 1.15,
1.16
Message-ID: <20070726084235.DBAFB600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv28062/d/kolabd/templates
Modified Files:
master.cf.template.in
Log Message:
Added discard service to the postfix master.cf configuration.
Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- master.cf.template.in 17 Jul 2007 15:26:05 -0000 1.15
+++ master.cf.template.in 26 Jul 2007 08:42:33 -0000 1.16
@@ -34,6 +34,7 @@
smtp unix - - n - - smtp
relay unix - - n - - smtp -o fallback_relay=
showq unix n - n - - showq
+discard unix - - n - - discard
error unix - - n - - error
retry unix - - n - - error
local unix - n n - - local
From cvs at kolab.org Thu Jul 26 14:42:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 14:42:05 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates master.cf.template.in, 1.14,
1.14.2.1
Message-ID: <20070726124205.7ED8E600175@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv12584/kolabd/kolabd/templates
Modified Files:
Tag: kolab_2_1_branch
master.cf.template.in
Log Message:
templates/master.cf.template.in: Add missing discard service.
Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- master.cf.template.in 26 Jun 2006 16:39:17 -0000 1.14
+++ master.cf.template.in 26 Jul 2007 12:42:03 -0000 1.14.2.1
@@ -34,6 +34,7 @@
smtp unix - - n - - smtp
relay unix - - n - - smtp -o fallback_relay=
showq unix n - n - - showq
+discard unix - - n - - discard
error unix - - n - - error
local unix - n n - - local
#virtual unix - n n - - virtual
From cvs at kolab.org Thu Jul 26 14:42:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 14:42:05 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.100,1.100.2.1
Message-ID: <20070726124205.7D65E600174@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv12584/kolabd/kolabd
Modified Files:
Tag: kolab_2_1_branch
ChangeLog
Log Message:
templates/master.cf.template.in: Add missing discard service.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.100.2.1
diff -u -d -r1.100 -r1.100.2.1
--- ChangeLog 27 Jun 2007 12:08:32 -0000 1.100
+++ ChangeLog 26 Jul 2007 12:42:03 -0000 1.100.2.1
@@ -1,3 +1,7 @@
+2007-07-26 Thomas Arendsen Hein
+
+ * templates/master.cf.template.in: Add missing discard service.
+
2007-06-27 Marcus Hüwe
* dist_conf/suse:
From cvs at kolab.org Thu Jul 26 14:42:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 14:42:05 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.131.2.4,1.131.2.5
Message-ID: <20070726124205.7BF2A600172@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv12584
Modified Files:
Tag: kolab_2_1_branch
release-notes.txt
Log Message:
templates/master.cf.template.in: Add missing discard service.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.131.2.4
retrieving revision 1.131.2.5
diff -u -d -r1.131.2.4 -r1.131.2.5
--- release-notes.txt 24 Jul 2007 10:29:09 -0000 1.131.2.4
+++ release-notes.txt 26 Jul 2007 12:42:03 -0000 1.131.2.5
@@ -1,5 +1,5 @@
-Kolab2 Server Release Notes
-===========================
+Kolab Server 2.1 Release Notes
+==============================
(Version 2007????, Kolab Server 2.1.???)
For upgrading and installation instructions, please refer to
@@ -48,6 +48,8 @@
Added missing Makefile dependencies
autoconfiscated kolabdcachetool, dirservnotify and dirservupdate.
+
+ Added "discard" service to the postfix master.cf configuration.
kolab/issue919 (kolab server has problems with some characters in passwords)
kolab/issue1025 (loading policy bank "MYUSERS": unknown field "mynetworks")
From cvs at kolab.org Thu Jul 26 14:43:04 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 14:43:04 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.101,1.102
Message-ID: <20070726124304.9A2B1600172@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv12678/kolabd
Modified Files:
ChangeLog
Log Message:
templates/master.cf.template.in: Use spaces instead of tabs for discard
to match the style of other lines.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- ChangeLog 26 Jul 2007 08:42:33 -0000 1.101
+++ ChangeLog 26 Jul 2007 12:43:02 -0000 1.102
@@ -1,3 +1,8 @@
+2007-07-26 Thomas Arendsen Hein
+
+ * templates/master.cf.template.in: Use spaces instead of tabs
+ for discard to match the style of other lines.
+
2007-07-26 Gunnar Wrobel
* templates/master.cf.template.in:
From cvs at kolab.org Thu Jul 26 14:43:04 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 14:43:04 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd/templates master.cf.template.in, 1.16,
1.17
Message-ID: <20070726124304.9BF8D600174@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv12678/kolabd/templates
Modified Files:
master.cf.template.in
Log Message:
templates/master.cf.template.in: Use spaces instead of tabs for discard
to match the style of other lines.
Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- master.cf.template.in 26 Jul 2007 08:42:33 -0000 1.16
+++ master.cf.template.in 26 Jul 2007 12:43:02 -0000 1.17
@@ -34,7 +34,7 @@
smtp unix - - n - - smtp
relay unix - - n - - smtp -o fallback_relay=
showq unix n - n - - showq
-discard unix - - n - - discard
+discard unix - - n - - discard
error unix - - n - - error
retry unix - - n - - error
local unix - n n - - local
From cvs at kolab.org Thu Jul 26 14:43:53 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 14:43:53 +0200 (CEST)
Subject: thomas: server release-notes.txt,1.135,1.136
Message-ID: <20070726124353.A2AD1600172@lists.intevation.de>
Author: thomas
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv12713
Modified Files:
release-notes.txt
Log Message:
Removed release notes before 2.1.0, first adjustments of other text.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- release-notes.txt 26 Jul 2007 08:42:33 -0000 1.135
+++ release-notes.txt 26 Jul 2007 12:43:51 -0000 1.136
@@ -1,48 +1,41 @@
-Kolab2 Server Release Notes
-===========================
-(Version 2007????, Kolab Server 2.1.???)
+Kolab Server 2.2 Release Notes
+==============================
+(Version 2007????, Kolab Server 2.2-beta???)
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 and 2.1:
-
- - Simple multi-domain support
+the 1st.README file in the package directory.
+Upgrading from Kolab server 2.1 is not yet documented.
- 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, which allows the Cyrus IMAP server to run
- more efficiently especially when you have many mailboxes.
+Differences between Kolab 2.1 and 2.2:
- 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.
+ The 2.2 release received many improvements and bugfixes for issues
+ found in the 2.1 versions and ... FIXME
Additionally many software components have been upgraded to new
upstream versions.
Changes between 2.2-beta-1 and 2.2-???:
+ FIXME (add CVS changes between 20070608 and 20070726)
+
- kolabd-2.1.99-2007????:
Added "discard" service to the postfix master.cf configuration.
-Changes between 2.1.0 and 2.1.???:
+Changes between 2.1.0 and 2.2-beta1:
+
+ FIXME (add CVS changes between 2.1.0 and 20070608 + patch series)
- clamav-0.90.3-20070531_kolab
New upstream version, fixes various security issues.
+XXX: Some of the following changes happened after 2.2-beta1, sort them
+
- perl-kolab-5.8.7-2007????
Added missing Makefile dependencies
@@ -92,375 +85,6 @@
kolab/issue1797 (kolab-webadmin source package missing PO files)
kolab/issue1845 (incorrect check mailForDn for ldap results)
kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)
-
-
-Changes between 2.1-rc-2 and 2.1.0:
-
- - 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-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-20070510
-
- 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)
-
- - kolab-webadmin-2.1.0-20070510
-
- kolab/issue1616 (Use different cursor for tags)
- kolab/issue1617 (fix small inconsistency in german translation)
-
-
-Changes between 2.1-rc-1 and 2.1-rc-2:
-
- - 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.
-
- - 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.
-
- 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
-
- 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-20070420
-
- Added debug option for verbose logging to stderr.
-
- - kolabd-2.1.0-20070420
-
- Fix the path to the freebusy directory for non-OpenPKG installations.
-
- Fix usage of tar and modification of rc.conf during slave setup for
- non-OpenPKG installations.
-
- Don't pass notifications and quarantined mails through amavisd-new.
-
- Updated configuration templates for ClamAV 0.90
-
- Updated openldap monitor configuration.
-
- 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)
- kolab/issue1680 (/kolab/bin/kolab fix)
-
- - kolab-horde-fbview-2.1.0-20070420
-
- Updated version number, no other changes since 2.1rc1
-
- - kolab-resource-handlers-2.1.0-20070420
-
- 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)
-
- - kolab-webadmin-2.1.0-20070420
-
- Updated Dutch and German translations.
-
- kolab/issue1457 (updated French translation)
- kolab/issue1612 (modify user ignores account type)
- kolab/issue1614 (ldap_add() - Constraint violation on change user account type)
- kolab/issue1630 (Domain maintainer can see distribution lists from other domains)
- kolab/issue1652 (Import users from ldif and LDAP Constraint violation)
- kolab/issue1654 (New LDAP overlay prevents modification of distribution lists)
- kolab/issue1663 (It is possible to create domain maintainers without domains)
- kolab/issue1670 (Renaming a domain maintainer twice within the same form fails)
-
-
-Changes between 2.1-beta-4 and 2.1-rc-1:
-
- - kolabd-2.0.99-20070205
-
- kolab/issue1335 (pfbcache.db locking problems)
- kolab/issue1507 (Public viewable phpinfo() and more in Server default installation)
- kolab/issue1550 (Masquerade problem, corrected template)
- kolab/issue1563 (freebusy.conf template doesn't match freebusy.conf from package)
- kolab/issue1575 (Openldap enhanced data integrity)
-
- - kolab-webadmin-2.0.99-20070205
-
- Disabled Spanish language selection from web admin interface, because
- of missing translation.
-
- kolab/issue1479 ("Type" of shared folder can only be modified in 2nd try)
- kolab/issue1486 ("About Kolab" in Webinterface needs work over)
- kolab/issue1539 (extension to the opening text, when the manager logs in for the 1st time)
- kolab/issue1559 (Domain Maintainer cannot delete "his" users)
- kolab/issue1586 ("Required field" not translated to German in web admin)
- kolab/issue1592 (LANGUAGE variable overrides web admin language selection)
-
-
-Changes between 2.1-beta-3 and 2.1-beta-4:
-
- - clamav-0.88.7-20061211
-
- bypass virus detection (CVE-2006-6406),
- denial of service, remotely exploitable (CVE-2006-6481)
- (http://kolab.org/security/kolab-vendor-notice-14.txt)
-
- - kolabd-2.0.99-20070117
-
- Updated proftpd.conf template: LDAPHomedirOnDemand(Prefix) is
- now named LDAPGenerateHomedir(Prefix).
-
- Set imapidlepoll to 5 seconds in imapd.conf.template.in.
-
- kolab/issue1433 (Some files in /kolab/etc/postfix have wrong ownership)
- kolab/issue1484 (Warnings using openldap = 2.3.27-2.20061018_kolab)
- kolab/issue1487 (amavisd.conf mynetworks incomplete)
- kolab/issue1531 (amavisd.conf local_domains only contains primary domain)
- kolab/issue1532 (Set "duplicatesuppression: 0" in imapd.conf.template?)
-
- - kolab-horde-fbview-2.0.99-20070112
-
- Improvements to the week view (part of kolab/issue666)
-
- Removed dangerous php scripts (part of kolab/issue1507)
-
- - kolab-resource-handlers-2.0.99-20070117
-
- kolab/issue1490 (freebusy cache written to /kolab/kolab/...)
- kolab/issue1512 (No FB information for resource accounts)
- kolab/issue1558 (kolab-webadmin and php 5.2.0)
-
- - kolab-webadmin-2.0.99-20070117
-
- kolab/issue1013 (user passwords sha1 encoded without salt)
- kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
- kolab/issue1418 (fields visible even when attribute_access is "hidden" in session_vars.php)
- kolab/issue1540 (Typo on kolab/admin/service page)
- kolab/issue1555 (Login screen shows error msg for no good reason)
-
- - openldap-2.3.29-2.20061110_kolab
-
- New upstream version, fixes CVE-2006-5779 (Bugtraq ID 20939)
-
- - perl-kolab-5.8.7-20070117
-
- Only print warning about missing configuration variable if relevant.
-
- kolab/issue1550 (Masquerade problem)
-
-
-Changes between 2.1-beta-2 and 2.1-beta-3:
-
- - openpkg-2.5.4-2.5.4
-
- New upstream version.
-
- - apache-1.3.33-2.5.6
-
- denial of service and possibly arbitrary code execution via crafted
- URLs that are not properly handled using certain rewrite rules.
- http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.015-apache.html
-
- - gzip-1.3.5-2.5.1
-
- denial of service, arbitrary code execution
- http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.020-gzip.html
-
- - curl-7.15.0-2.5.2
-
- buffer overflow
- http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.012-curl.html
-
- - openssl-0.9.8a-2.5.4
-
- denial of service, may allow execution of arbitrary code
- (http://kolab.org/security/kolab-vendor-notice-12.txt)
-
- - clamav-0.88.5-2.20061018
-
- buffer overflow, remotely exploitable (CVE-2006-4018)
- (http://kolab.org/security/kolab-vendor-notice-10.txt)
-
- heap overflow, remotely exploitable (CVE-2006-4182),
- denial of service, remotely exploitable (CVE-2006-5295)
- (http://kolab.org/security/kolab-vendor-notice-13.txt)
-
- - file-4.15-2.5.0_kolab
-
- kolab/issue1458 (Password protected .sxw files can be banned by
- amavisd, as a result of the file command)
-
- - openldap-2.3.27-2.20061018_kolab
-
- New upstream version, fixes CVE-2006-4600 (Bugtraq ID 19832)
- and other problems.
-
- kolab/issue1229 (Master openldap's slurpd fails to start after
- adding slave)
- kolab/issue1431 (Slave cannot access master ldap server via SSL)
-
- - imapd-2.2.12-2.5.0_kolab2
-
- Fix folder structure for foldernames with non-alphanumeric characters,
- when using skiplist as the database backend for mailboxes.db.
-
- - perl-kolab-5.8.7-20061110
-
- kolab/issue1194 (serious performance problem on high number of users)
-
- - kolabd-2.0.99-20061110
-
- Added missing relay service for postfix.
-
- Changed main.cf masquerading defaults so email to
- user at machine.example.org is actually delivered.
-
- Use mailbox_transport instead of local_transport for
- kolabmailboxfilter to work around issue825.
-
- Removed doubled attribute cyrus-autocreatequota.
-
- Added indexes for delegate and delete.
-
- Updated freebusy.conf template for freebusy IMAP caching.
-
- Changed imapd.conf template to use berkeley db instead of
- skiplist for annotations.db and mailboxes.db as a workaround
- for kolab/issue840 (Annotations needs to be more robust).
-
- kolab/issue824 (kolabmailboxfilter run once for each recipient)
- kolab/issue1264 (Add support for sieve based notifications)
- kolab/issue1273 (Sending as delegate broken in Kolab server 2.1)
- kolab/issue1428 (Fixed locking issue)
- kolab/issue1433 (Some files in /kolab/etc/postfix have wrong ownership)
-
- - kolab-webadmin-2.0.99-20061110
-
- Fixes for setting folder type of shared folders.
-
- Guard against large number of users.
-
- kolab/issue1457 (updated French translation)
-
- - kolab-resource-handlers-2.0.99-20061110
-
- Improvements and fixes for freebusy IMAP caching.
-
- kolab/issue815 (invitation replies vanish in resmgr)
- kolab/issue957 (All-day events from Outlook don't show up in freebusy)
- kolab/issue974 (Localize the text for rewritten From: headers)
- kolab/issue1042 (empty lines at the end of mails delivered via LMTP)
- kolab/issue1352 (resmgr can create wrong range dates)
- kolab/issue1387 (resmgr replies to replies creating mail loop)
- kolab/issue1422 (Dummy freebusy info)
-
-
-Changes between 2.1-beta-1 and 2.1-beta-2:
-
- OpenPKG updates:
-
- openpkg-2.5.2-2.5.2
- openpkg-registry-0.2.7-20060223
- libxslt-1.1.15-2.5.1
- php-smarty-2.6.10-20051003
- clamav-0.88.2-20060524
-
- binutils-2.16.1-2.5.1
- http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.009-binutils.html
-
- openldap-2.3.11-2.5.1
- http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.008-openldap.html
-
-
- Kolab updates:
-
- More distconf changes by Richard Bos and Markus Hüwe.
-
- - perl-kolab-5.8.7-20060619
-
- Resolved:
- Issue1194 (kolabd quota performance)
- Issue1220 (postfix permissions)
- issue1237 (Handling of @@@var@@@ in Conf.pm (Gunnar Wrobel))
-
- - kolabd-2.0.99-20060619
-
- * The default imapd configuration has been changed to enable the
- hashimapspool option. This affects the upgrade procedure.
- See 1st.README for upgrade instructions.
-
- * amavis now logs to /kolab/var/amavisd/amavisd.log. This is
- part of the fix for Issue1015
-
- Resolved:
- Issue1015 (fixing logging and logrotate for amavisd)
- Issue1089 (enable hashimapspool for imapd to cope with many users)
- Issue1101 (allowapop: no; disable apop access to imapd by default)
- Issue1105 (fix compilation of kolabd on FreeBSD)
- Issue1257 (wrong attribute name for imap quota)
-
- - kolab-webadmin-2.0.99-20060619
-
- * patch from Tobias König in order to support setting of
- foldertype for public folders
-
- Resolved:
- Issue848 (Modifying address book entry may break distribution list)
- Issue1106 (email validation in webgui)
- Issue1214 (number of days for vacation messages on webinterface)
- Issue1263 (Bug in the shared folders folder-type code) [Wrobel]
-
- - kolab-resource-handlers-2.0.99-20060619
-
- * create empty pfbcache.db if missing
-
- Resolved:
- Issue973 (quoting and rewriting From header)
- Issue966 (Wrong CN for resource accounts)
- Issue1042 (server modifies email content)
- Issue1195 (error message in bounce)
- Issue1243 (rewriting fails when "From:" contains quoted printable)
- Issue1245 (rewriting problems on folded Header "From:"-line)
$Id$
From cvs at kolab.org Thu Jul 26 17:04:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:04:52 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.102, 1.103 Makefile.am, 1.26,
1.27 kolab.globals, 1.3, 1.4 kolabd.in, 1.3,
1.4 dirservnotify.in, 1.1, NONE dirservupdate.in, 1.1, NONE
Message-ID: <20070726150452.25DF7600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv16935/kolabd/kolabd
Modified Files:
ChangeLog Makefile.am kolab.globals kolabd.in
Removed Files:
dirservnotify.in dirservupdate.in
Log Message:
Removed dirserv-support from kolabd.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- ChangeLog 26 Jul 2007 12:43:02 -0000 1.102
+++ ChangeLog 26 Jul 2007 15:04:50 -0000 1.103
@@ -1,3 +1,17 @@
+2007-07-26 Gunnar Wrobel
+
+ * Makefile.am:
+ * dirservnotify.in:
+ * dirservupdate.in:
+ * kolab.globals:
+ * kolabd.in:
+
+ Removing "dirserv"-support from kolabd. The corresponding
+ perl-module has been left untouched since its first import in
+ kolab CVS and still uses the very first Kolab schema. It does not
+ work at the moment. If somebody thinks this should be revived,
+ please revert and fix the corresponding Kolab::DirServ module.
+
2007-07-26 Thomas Arendsen Hein
* templates/master.cf.template.in: Use spaces instead of tabs
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am 17 Jul 2007 15:26:05 -0000 1.26
+++ Makefile.am 26 Jul 2007 15:04:50 -0000 1.27
@@ -27,8 +27,6 @@
kolabquotawarn \
kolab_upgrade \
kolab_smtpdpolicy \
- dirservnotify \
- dirservupdate \
kolabdcachetool
@@ -242,20 +240,6 @@
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
Index: kolab.globals
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab.globals 28 Mar 2007 01:51:35 -0000 1.3
+++ kolab.globals 26 Jul 2007 15:04:50 -0000 1.4
@@ -29,10 +29,6 @@
user_field_modified : modifytimestamp
user_field_quota : cyrus-userquota
user_object_class : inetOrgPerson
-dirserv_mailbox_server :
-dirserv_mailbox_user :
-dirserv_mailbox_password :
-dirserv_poll_period : 120
maildefer_size:
maildefer_header:
maildefer_listen: 127.0.0.1:10024
Index: kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabd.in 27 Nov 2005 23:57:02 -0000 1.3
+++ kolabd.in 26 Jul 2007 15:04:50 -0000 1.4
@@ -35,7 +35,6 @@
# Y: Cyrus
# B: Backend
# KC: kolabconf
-# DS: DirServ
# Anything else: the various backends
#
@@ -44,7 +43,6 @@
use IO::File;
use Kolab;
use Kolab::Util;
-use Kolab::DirServ;
use Kolab::LDAP;
use Kolab::LDAP::Backend;
use vars qw(%pids);
@@ -88,7 +86,6 @@
Kolab::log('K', 'Synchronising');
Kolab::LDAP::sync;
Kolab::log('K', 'Reloading addressbook.peers');
- Kolab::DirServ::reloadPeers;
Kolab::log('K', 'Finished refresh');
&run;
}
@@ -158,7 +155,6 @@
Kolab::LDAP::Backend::load;
Kolab::LDAP::Backend::load('user');
Kolab::LDAP::Backend::load('sf');
- Kolab::LDAP::Backend::load('dirservd',1);
Kolab::log('K', 'Performing backend startup');
&Kolab::LDAP::Backend::startup;
--- dirservnotify.in DELETED ---
--- dirservupdate.in DELETED ---
From cvs at kolab.org Thu Jul 26 17:04:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:04:52 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.136,1.137
Message-ID: <20070726150452.1DF4D600172@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv16935
Modified Files:
release-notes.txt
Log Message:
Removed dirserv-support from kolabd.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- release-notes.txt 26 Jul 2007 12:43:51 -0000 1.136
+++ release-notes.txt 26 Jul 2007 15:04:50 -0000 1.137
@@ -25,6 +25,8 @@
Added "discard" service to the postfix master.cf configuration.
+ Removed "dirserv"-support.
+
Changes between 2.1.0 and 2.2-beta1:
From cvs at kolab.org Thu Jul 26 17:17:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:17:58 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-DirServ Changes, 1.1,
NONE DirServ.pm.in, 1.1, NONE MANIFEST, 1.1, NONE META.yml, 1.1,
NONE README, 1.1, NONE
Message-ID: <20070726151758.B6F0760C4A6@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-DirServ
In directory doto:/tmp/cvs-serv17485/perl-kolab/Kolab-DirServ
Removed Files:
Changes DirServ.pm.in MANIFEST META.yml README
Log Message:
Removed dirserv-support from perl-kolab.
--- Changes DELETED ---
--- DirServ.pm.in DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
--- README DELETED ---
From cvs at kolab.org Thu Jul 26 17:17:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:17:58 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.137,1.138
Message-ID: <20070726151758.AAA76600172@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv17485
Modified Files:
release-notes.txt
Log Message:
Removed dirserv-support from perl-kolab.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- release-notes.txt 26 Jul 2007 15:04:50 -0000 1.137
+++ release-notes.txt 26 Jul 2007 15:17:56 -0000 1.138
@@ -21,6 +21,10 @@
FIXME (add CVS changes between 20070608 and 20070726)
+ - perl-kolab-5.8.8-2007????
+
+ Removed "dirserv"-support.
+
- kolabd-2.1.99-2007????:
Added "discard" service to the postfix master.cf configuration.
From cvs at kolab.org Thu Jul 26 17:17:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:17:58 +0200 (CEST)
Subject: gunnar: server/perl-kolab ChangeLog,1.16,1.17 Makefile.am,1.10,1.11
Message-ID: <20070726151758.B0756600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv17485/perl-kolab
Modified Files:
ChangeLog Makefile.am
Log Message:
Removed dirserv-support from perl-kolab.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeLog 21 Jun 2007 17:52:24 -0000 1.16
+++ ChangeLog 26 Jul 2007 15:17:56 -0000 1.17
@@ -1,3 +1,13 @@
+2007-07-26 Gunnar Wrobel
+
+ * Makefile.am:
+ * Kolab/Kolab.pm.in:
+ * Kolab-LDAP/LDAP.pm.in:
+ * Kolab-LDAP-Backend-dirservd/*:
+ * Kolab-DirServ/*:
+
+ Removed outdated "dirserv"-support from perl-kolab.
+
2007-06-21 Marcus Hüwe
* Makefile.am: added Makefile dependencies
@@ -7,7 +17,7 @@
* Kolab-Conf/Conf.pm.in (build): Only print "No configuration
variable corresponding to `$1' exists" in case we are NOT skipping
the section.
-
+
2006-03-20 Marcus Hüwe
Patch commited by Richard Bos
* Kolab-Conf/Conf.pm.in: introduce a new variable phpinit_dir for the
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am 21 Jun 2007 17:52:24 -0000 1.10
+++ Makefile.am 26 Jul 2007 15:17:56 -0000 1.11
@@ -16,7 +16,6 @@
perl_modulesdir = $(perllib)/Kolab
perl_modules_DATA = Kolab-Conf/Conf.pm \
Kolab-Cyrus/Cyrus.pm \
- Kolab-DirServ/DirServ.pm \
Kolab-LDAP/LDAP.pm \
Kolab-Mailer/Mailer.pm \
Kolab-Util/Util.pm
@@ -30,14 +29,12 @@
LDAP_module_FILES = Kolab-LDAP-Backend-ad/ad.pm \
- Kolab-LDAP-Backend-dirservd/dirservd.pm \
Kolab-LDAP-Backend-slurpd/slurpd.pm
LDAP_moduledir = $(backenddir)/Backend
LDAP_module_DATA = $(LDAP_module_FILES)
-EXTRA_DIST += Kolab-LDAP-Backend-ad/ad.pm \
- Kolab-LDAP-Backend-dirservd/dirservd.pm
+EXTRA_DIST += Kolab-LDAP-Backend-ad/ad.pm
pkdocdir = $(pkgdocdir)/perl-kolab
dist_pkdoc_DATA = ChangeLog NEWS AUTHORS COPYING
@@ -54,12 +51,6 @@
$(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.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.in
@$(mkinstalldirs) Kolab-LDAP
From cvs at kolab.org Thu Jul 26 17:17:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:17:58 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP LDAP.pm.in,1.7,1.8
Message-ID: <20070726151758.BCC7260C4CF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP
In directory doto:/tmp/cvs-serv17485/perl-kolab/Kolab-LDAP
Modified Files:
LDAP.pm.in
Log Message:
Removed dirserv-support from perl-kolab.
Index: LDAP.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- LDAP.pm.in 28 Mar 2007 01:48:28 -0000 1.7
+++ LDAP.pm.in 26 Jul 2007 15:17:56 -0000 1.8
@@ -33,7 +33,6 @@
use Kolab;
use Kolab::Util;
use Kolab::Cyrus;
-use Kolab::DirServ;
use vars qw(%uid_db %gyard_db %newuid_db %gyard_ts_db %quota_db);
require Exporter;
@@ -308,7 +307,6 @@
Kolab::log('L', "Object `$uid' already exists, skipping", KOLAB_DEBUG);
}
# Nothing changed; nothing to do
- #Kolab::DirServ::genericRequest($object, "modify alias");
} else {
# No official records - check the graveyard
my $oldgyarduid = $gyard_db{$guid} || '';
@@ -359,7 +357,6 @@
# mkdir( $fbdir, 0750);
# chown( $Kolab::config{'kolab_n_uid'},$Kolab::config{'kolab_n_gid'},$fbdir );
# }
- Kolab::DirServ::genericRequest($object, "new alias") if $p eq 'user';
}
}
@@ -507,8 +504,6 @@
Kolab::log('L', 'Deleted object not found in mboxcache, returning', KOLAB_DEBUG);
return;
}
-
- Kolab::DirServ::genericRequest($object, "remove alias") if $p eq 'user';
Kolab::Cyrus::deleteMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0));
# if( $p ne 'sf' ) {
From cvs at kolab.org Thu Jul 26 17:17:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:17:58 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab Kolab.pm.in,1.6,1.7
Message-ID: <20070726151758.B446160C4A5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab
In directory doto:/tmp/cvs-serv17485/perl-kolab/Kolab
Modified Files:
Kolab.pm.in
Log Message:
Removed dirserv-support from perl-kolab.
Index: Kolab.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Kolab.pm.in 28 Mar 2007 01:48:28 -0000 1.6
+++ Kolab.pm.in 26 Jul 2007 15:17:56 -0000 1.7
@@ -382,8 +382,6 @@
# Defaults to seven days.
# $config{'gyard_deletion_period'} = 7 * 24 * 60 if (!exists $config{'gyard_deletion_period'});
- $config{'dirserv_home_server'} = $config{'fqdn'} if (!exists $config{'dirserv_home_server'});
-
# That's it! We now have our config hash.
#Kolab::LDAP::destroy($ldap);
if (defined($ldap) && $ldap->isa('Net::LDAP')) {
From cvs at kolab.org Thu Jul 26 17:17:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:17:58 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-DirServ/t 1.t,1.1,NONE
Message-ID: <20070726151758.B99F560C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-DirServ/t
In directory doto:/tmp/cvs-serv17485/perl-kolab/Kolab-DirServ/t
Removed Files:
1.t
Log Message:
Removed dirserv-support from perl-kolab.
--- 1.t DELETED ---
From cvs at kolab.org Thu Jul 26 17:17:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:17:58 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend-dirservd/t 1.t, 1.1,
NONE
Message-ID: <20070726151758.C6E44600172@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-dirservd/t
In directory doto:/tmp/cvs-serv17485/perl-kolab/Kolab-LDAP-Backend-dirservd/t
Removed Files:
1.t
Log Message:
Removed dirserv-support from perl-kolab.
--- 1.t DELETED ---
From cvs at kolab.org Thu Jul 26 17:17:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:17:58 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend-dirservd Changes, 1.1,
NONE MANIFEST, 1.1, NONE META.yml, 1.1, NONE README, 1.1,
NONE dirservd.pm, 1.3, NONE
Message-ID: <20070726151758.C037860C4D0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-dirservd
In directory doto:/tmp/cvs-serv17485/perl-kolab/Kolab-LDAP-Backend-dirservd
Removed Files:
Changes MANIFEST META.yml README dirservd.pm
Log Message:
Removed dirserv-support from perl-kolab.
--- Changes DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
--- README DELETED ---
--- dirservd.pm DELETED ---
From cvs at kolab.org Thu Jul 26 17:36:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:36:50 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Mailer/t 1.t,1.1,NONE
Message-ID: <20070726153650.B7CAB60C4A5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Mailer/t
In directory doto:/tmp/cvs-serv18115/perl-kolab/Kolab-Mailer/t
Removed Files:
1.t
Log Message:
Removed the Kolab-Mailer module in perl-kolab.
--- 1.t DELETED ---
From cvs at kolab.org Thu Jul 26 17:36:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:36:50 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.138,1.139
Message-ID: <20070726153650.AF664600172@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv18115
Modified Files:
release-notes.txt
Log Message:
Removed the Kolab-Mailer module in perl-kolab.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- release-notes.txt 26 Jul 2007 15:17:56 -0000 1.138
+++ release-notes.txt 26 Jul 2007 15:36:48 -0000 1.139
@@ -23,6 +23,8 @@
- perl-kolab-5.8.8-2007????
+ Removed the Kolab-Mailer module.
+
Removed "dirserv"-support.
- kolabd-2.1.99-2007????:
From cvs at kolab.org Thu Jul 26 17:36:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:36:50 +0200 (CEST)
Subject: gunnar: server/perl-kolab ChangeLog,1.17,1.18 Makefile.am,1.11,1.12
Message-ID: <20070726153650.B3F01600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv18115/perl-kolab
Modified Files:
ChangeLog Makefile.am
Log Message:
Removed the Kolab-Mailer module in perl-kolab.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ChangeLog 26 Jul 2007 15:17:56 -0000 1.17
+++ ChangeLog 26 Jul 2007 15:36:48 -0000 1.18
@@ -1,6 +1,12 @@
2007-07-26 Gunnar Wrobel
* Makefile.am:
+ * Kolab-Mailer/*:
+
+ Removed the Kolab-Mailer module. It was only used by the
+ "dirserv"-code.
+
+ * Makefile.am:
* Kolab/Kolab.pm.in:
* Kolab-LDAP/LDAP.pm.in:
* Kolab-LDAP-Backend-dirservd/*:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am 26 Jul 2007 15:17:56 -0000 1.11
+++ Makefile.am 26 Jul 2007 15:36:48 -0000 1.12
@@ -17,7 +17,6 @@
perl_modules_DATA = Kolab-Conf/Conf.pm \
Kolab-Cyrus/Cyrus.pm \
Kolab-LDAP/LDAP.pm \
- Kolab-Mailer/Mailer.pm \
Kolab-Util/Util.pm
EXTRA_DIST += Kolab-Cyrus/Cyrus.pm \
@@ -27,7 +26,6 @@
backenddir = $(perl_modulesdir)/LDAP
dist_backend_DATA = Kolab-LDAP-Backend/Backend.pm
-
LDAP_module_FILES = Kolab-LDAP-Backend-ad/ad.pm \
Kolab-LDAP-Backend-slurpd/slurpd.pm
@@ -63,12 +61,6 @@
$(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.in
- @$(mkinstalldirs) Kolab-Mailer
- $(do_subst) <$(srcdir)/Kolab-Mailer/Mailer.pm.in > $@
-CLEANFILES += Kolab-Mailer/Mailer.pm
-EXTRA_DIST += Kolab-Mailer/Mailer.pm.in
CLEANFILES += perl-kolab.spec
From cvs at kolab.org Thu Jul 26 17:36:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 26 Jul 2007 17:36:50 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Mailer Changes, 1.1, NONE MANIFEST,
1.1, NONE META.yml, 1.1, NONE Mailer.pm.in, 1.1, NONE README,
1.1, NONE
Message-ID: <20070726153650.BA47C60C4A6@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Mailer
In directory doto:/tmp/cvs-serv18115/perl-kolab/Kolab-Mailer
Removed Files:
Changes MANIFEST META.yml Mailer.pm.in README
Log Message:
Removed the Kolab-Mailer module in perl-kolab.
--- Changes DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
--- Mailer.pm.in DELETED ---
--- README DELETED ---
From cvs at kolab.org Fri Jul 27 08:23:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 08:23:24 +0200 (CEST)
Subject: gunnar: server install-kolab.sh,1.1,1.2
Message-ID: <20070727062324.BD29C600174@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv16505
Modified Files:
install-kolab.sh
Log Message:
Added some more options to the Kolab installer script.
Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- install-kolab.sh 17 Jul 2007 16:30:53 -0000 1.1
+++ install-kolab.sh 27 Jul 2007 06:23:22 -0000 1.2
@@ -1,50 +1,255 @@
#!/bin/sh
KOLAB_VERSION="2.2-beta1"
-PREFIX="/kolab"
+KID="19414"
+
TAG="kolab"
+USER=""
+PREFIX=""
+
+INSTALL=""
+
+#Flags
+FLAG_BASE=""
+FLAG_ENV=""
+FLAG_CLEAN=""
usage() {
echo "Usage:"
- echo " $0 directory/openpkg-*-*.src.sh"
- echo " $0 directory/openpkg-*-*.ix86-debian4.0.sh"
- echo " $0 directory"
+ echo " $0 -i directory/openpkg-*-*.src.sh"
+ echo " $0 -i directory/openpkg-*-*.ix86-debian4.0.sh"
+ echo " $0 -i directory"
+ echo
+ echo " -h (display this help)"
+ echo
+ echo "Advanced options:"
+ echo
+ echo " -t TAG (alternate binary tag; default is kolab)"
+ echo " -I UID (alternate base uid; default is 19414)"
+ echo
+ echo " -c (clean the environment specified with \$PREFIX; DANGEROUS!)"
+ echo
+ echo " -p PREFIX (alternate installation prefix; default is /\$TAG)"
+ echo " -u USER (alternate user name; default is \$TAG)"
+ echo
+ echo " -V VERSION (alternate version; default is 2.2-beta1)"
+ echo
+ echo " -D (generate a binary distribution based on ./ and /\$PREFIX)"
+ echo " -S (generate a source distribution based on ./ and /\$PREFIX)"
+ echo
+ echo " -B (abort after generating the basic openpkg binary)"
+ echo " -E (abort after generating the openpkg environment)"
exit 1
}
-[ $# -ne 1 ] && usage
+while getopts hcBDSEi:V:p:I:u:t: ARGS; do
+ case $ARGS in
+ h) # Display help
+ usage
+ ;;
+ i) # What should be installed?
+ INSTALL="$OPTARG"
+ ;;
+ V) # User specified a specific Kolab version
+ KOLAB_VERSION="$OPTARG"
+ ;;
+ p) # User specified an alternative prefix
+ PREFIX="$OPTARG"
+ ;;
+ I) # User specified an alternative base Kolab UID
+ KID="$OPTARG"
+ ;;
+ u) # User specified an alternative user name
+ USER="$OPTARG"
+ ;;
+ t) # User specified an alternative tag
+ TAG="$OPTARG"
+ ;;
+ B) # User only wants the basic openpkg package in binary form
+ FLAG_BASE="Yes"
+ ;;
+ E) # User only wants the basic openpkg environment
+ FLAG_ENV="Yes"
+ ;;
+ c) # User wants to erase the openpkg environment
+ FLAG_CLEAN="Yes"
+ ;;
+ D) # User wants to collect a set of binary packages into a distribution
+ FLAG_BDIST="Yes"
+ ;;
+ S) # User wants to collect a set of source packages into a distribution
+ FLAG_SDIST="Yes"
+ ;;
+ *) # Unknown Option
+
+ ;;
+ esac
+done
-if echo "$1" | grep '\.src\.sh$' >/dev/null; then
+if [ -z "$USER" ]; then
+ USER=$TAG
+fi
+
+if [ -z "$PREFIX" ]; then
+ PREFIX="/$TAG"
+fi
+
+R_KID=$(($KID + 1))
+N_KID=$(($R_KID + 1))
+
+if [ -n "$FLAG_CLEAN" -o -n "$FLAG_BDIST" -o -n "$FLAG_SDIST" ]; then
+ if [ -x "$PREFIX/bin/openpkg" ]; then
+ if [ -n "$FLAG_CLEAN" ]; then
+ echo
+ echo "This will completely wipe your installation in $PREFIX!"
+ echo "Are you certain you want to do that (YES/NO)?"
+ read ANSWER
+ if [ "$ANSWER" == "YES" ]; then
+ $PREFIX/bin/openpkg rpm -e `$PREFIX/bin/openpkg rpm -qa` || exit $?
+ echo "Erased OpenPKG environment $PREFIX"
+ exit 0
+ else
+ echo "Not cleaning."
+ exit 0
+ fi
+ elif [ -n "$FLAG_SDIST" ]; then
+ SDIST_DIR=$PREFIX/RPM/SDIST
+ INSTALLER=`find . -name openpkg-*.src.sh -print`
+ if [ -z "$INSTALLER" ]; then
+ echo "No source based installer found. Unable to create a source distribution!"
+ exit 1
+ fi
+ mkdir -p $SDIST_DIR
+ cp $0 $SDIST_DIR
+ if [ -n "$INSTALLER" ]; then
+ cp $INSTALLER $SDIST_DIR
+ fi
+ if [ -n "*.src.rpm" ]; then
+ cp *.src.rpm $SDIST_DIR
+ fi
+ if [ -n "$PREFIX/RPM/PKG/*.src.rpm" ]; then
+ cp $PREFIX/RPM/PKG/*.src.rpm $SDIST_DIR
+ fi
+ chown -R $USER:$USER $SDIST_DIR
+ cd $SDIST_DIR && $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i .
+ exit 0
+ elif [ -n "$FLAG_BDIST" ]; then
+ PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG
+ BDIST_DIR=$PREFIX/RPM/BDIST
+ BINARY=`find . -name openpkg-*$PLATTAG.sh -print`
+ if [ -z "$BINARY" ]; then
+ echo "No binary installer package found. Unable to create a binary distribution!"
+ exit 1
+ fi
+ mkdir -p $BDIST_DIR
+ cp $0 $BDIST_DIR
+ if [ -n "$BINARY" ]; then
+ cp $BINARY $BDIST_DIR
+ fi
+ if [ -n "*$PLATTAG.rpm" ]; then
+ cp *$PLATTAG.rpm $BDIST_DIR
+ fi
+ if [ -n "$PREFIX/RPM/PKG/*$PLATTAG.rpm" ]; then
+ cp $PREFIX/RPM/PKG/*$PLATTAG.rpm $BDIST_DIR
+ fi
+ chown -R $USER:$USER $BDIST_DIR
+ cd $BDIST_DIR && $PREFIX/bin/openpkg index -r . -o 00INDEX.rdf -i -p $PLATTAG .
+ exit 0
+ else
+ echo "\"$PREFIX\" seems to be no OpenPKG environment."
+ exit 1
+ fi
+ fi
+fi
+
+echo
+echo "Kolab installation tag (TAG): $TAG"
+echo "Kolab installation prefix (PREFIX): $PREFIX"
+echo "Kolab version (KOLAB_VERSION): $KOLAB_VERSION"
+echo "Kolab user name (USER): $USER"
+echo "Kolab user base UID (KID): $KID"
+echo "Kolab restricted UID (KID): $R_KID"
+echo "Kolab non-priviledged UID (KID): $N_KID"
+echo
+
+if [ -z "$INSTALL" ]; then
+ # Hm, user wants us to figure out what we should do
+ echo "Received no instructions. Trying to determine required action..."
+ if [ -d "$PREFIX/etc/openpkg" ]; then
+ # Assume an upgrade based on the current directory
+ INSTALL=`pwd`
+ echo "Found an OpenPKG envrionment. Assuming upgrade..."
+ else
+ INSTALLER=`find . -name openpkg-*.src.sh -print`
+ BINARY=`find . -name openpkg-*.sh \! -name openpkg-*.src.sh -print`
+ if [ -z "$INSTALLER" ]; then
+ # No install script? Determine if there is a binary script
+ if [ -z "$BINARY" ]; then
+ echo "Sorry there is no OpenPKG installation script in the current directory!"
+ usage
+ exit 0
+ else
+ # Looks like we only have a binary. Hope that it matches the plattform and install it
+ INSTALL="$BINARY"
+ echo "Found a binary OpenPKG package. This will be installed now."
+ fi
+ else
+ # We have a source package. Check for a matching binary
+ PLATTAG=`sh "$INSTALLER" -t | tar xf - -O shtool | sh -s platform --type=binary`-$TAG
+ BIN=`basename "$INSTALLER" .src.sh`.$PLATTAG.sh
+ if [ "$BINARY" == "$BIN" ]; then
+ # There is a binary with the correct tag. Install it
+ INSTALL=$BIN
+ echo "Found a binary OpenPKG package with a correct tag. This will be installed now."
+ else
+ # Install from source
+ INSTALL=$INSTALLER
+ echo "Found a source based OpenPKG installer. Trying to install Kolab from source."
+ fi
+ fi
+ fi
+fi
+
+if echo "$INSTALL" | grep '\.src\.sh$' >/dev/null; then
# install from source
- SRC="$1"
- PLATTAG=`sh "$1" -t | tar xf - -O shtool | sh -s platform --type=binary`-$TAG
- BIN=`basename "$1" .src.sh`.$PLATTAG.sh
+ SRC="$INSTALL"
+ PLATTAG=`sh "$INSTALL" -t | tar xf - -O shtool | sh -s platform --type=binary`-$TAG
+ BIN=`basename "$INSTALL" .src.sh`.$PLATTAG.sh
DIR=`dirname "$SRC"`
-elif echo "$1" | grep 'openpkg-.*\.sh$' >/dev/null; then
+elif echo "$INSTALL" | grep 'openpkg-.*\.sh$' >/dev/null; then
# install from binary
SRC=""
- BIN="$1"
+ BIN="$INSTALL"
DIR=`dirname "$BIN"`
elif [ -d "$PREFIX/etc/openpkg" ]; then
# upgrade
SRC=""
BIN=""
- DIR="$1"
+ DIR="$INSTALL"
fi
DIR=`cd $DIR; pwd`
if [ -n "$SRC" ]; then
+ echo "Creating binary openpkg package from $SRC!"
sh "$SRC" \
--prefix="$PREFIX" \
- --tag="$TAG" --user="kolab" --group="kolab" \
- --muid="19414" --ruid="19415" --nuid="19416" \
- --mgid="19414" --rgid="19415" --ngid="19416" \
+ --tag="$TAG" --user="$USER" --group="$USER" \
+ --muid="$KID" --ruid="$R_KID" --nuid="$N_KID" \
+ --mgid="$KID" --rgid="$R_KID" --ngid="$N_KID" \
|| exit $?
+ if [ -n "$FLAG_BASE" ]; then
+ echo "Created basic openpkg binary for you platform!"
+ exit 0
+ fi
fi
if [ -n "$BIN" ]; then
sh "$BIN" || exit $?
+ if [ -n "$FLAG_ENV" ]; then
+ echo "Created basic openpkg environment!"
+ exit 0
+ fi
fi
if [ -n "$DIR" ]; then
From cvs at kolab.org Fri Jul 27 12:30:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 12:30:35 +0200 (CEST)
Subject: gunnar: server/kolab-horde-framework Makefile,1.6,1.7
Message-ID: <20070727103035.600E16184AC@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-framework
In directory doto:/tmp/cvs-serv22913/kolab-horde-framework
Modified Files:
Makefile
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-horde-framework/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 17 Jul 2007 15:07:15 -0000 1.6
+++ Makefile 27 Jul 2007 10:30:33 -0000 1.7
@@ -1,13 +1,22 @@
-RPM = /kolab/bin/openpkg rpm
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
-endif
-
PACKAGE = kolab-horde-framework
VERSION = 2.1.99
RELEASE = 20070607
KOLABRELEASE = $(RELEASE)
PEARVERSION = 1.3
+
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
+
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
From cvs at kolab.org Fri Jul 27 12:30:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 12:30:35 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview Makefile,1.6,1.7
Message-ID: <20070727103035.5E9F26184AB@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview
In directory doto:/tmp/cvs-serv22913/kolab-horde-fbview
Modified Files:
Makefile
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 17 Jul 2007 15:07:15 -0000 1.6
+++ Makefile 27 Jul 2007 10:30:33 -0000 1.7
@@ -1,13 +1,20 @@
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
-endif
-
PACKAGE = kolab-horde-fbview
VERSION = 2.1.99
RELEASE = 20070607
KOLABRELEASE = $(RELEASE)
-RPM = /kolab/bin/openpkg rpm
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
From cvs at kolab.org Fri Jul 27 12:30:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 12:30:35 +0200 (CEST)
Subject: gunnar: server Makefile,1.25,1.26
Message-ID: <20070727103035.5D1EF6184A9@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv22913
Modified Files:
Makefile
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile 23 Jul 2007 16:06:42 -0000 1.25
+++ Makefile 27 Jul 2007 10:30:33 -0000 1.26
@@ -1,3 +1,30 @@
+ifeq "x$(HOME)" "x"
+ HOME = /kolab
+endif
+
+# Don't know if this is correct but if somebody
+# calls this makefile as root we assume that there
+# is an installation in /kolab
+ifeq "x$(HOME)" "x/root"
+ HOME = /kolab
+endif
+
+ifeq "x$(KOLABPKGURI)" "x"
+ export KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
+endif
+ifeq "x$(RPM)" "x"
+ export RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ export KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ export KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ export KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
+
BASE_PACKAGES=openldap \
php-smarty
@@ -41,9 +68,9 @@
.PHONY: base
base: stage
- for PKG in $(BASE_PACKAGES); \
- do \
- make -C $$PKG dist || exit $?; \
+ for PKG in $(BASE_PACKAGES); \
+ do \
+ make -e -C $$PKG dist || exit $?; \
done
.PHONY: kolab
@@ -71,14 +98,18 @@
echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
.PHONY: clean
-clean:
- rm -rf stage
- find . -name "*.src.rpm" -exec rm -f {} \;
+clean: clean-base clean-horde clean-stage
-.PHONY: clean
-clean: clean-horde
+.PHONY: clean-stage
+clean-stage:
rm -rf stage
- find . -name "*.src.rpm" -exec rm -f {} \;
+
+.PHONY: clean-base
+clean-base:
+ for PKG in $(BASE_PACKAGES); \
+ do \
+ make -C $$PKG clean || exit $?; \
+ done
.PHONY: clean-horde
clean-horde:
From cvs at kolab.org Fri Jul 27 12:30:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 12:30:35 +0200 (CEST)
Subject: gunnar: server/kolabd Makefile,1.10,1.11
Message-ID: <20070727103035.737D06184AF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd
In directory doto:/tmp/cvs-serv22913/kolabd
Modified Files:
Makefile
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile 1 Jan 2006 22:21:19 -0000 1.10
+++ Makefile 27 Jul 2007 10:30:33 -0000 1.11
@@ -1,14 +1,21 @@
-RPM = /kolab/bin/openpkg rpm
PACKAGE=kolabd
-
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
-endif
-
VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
RELEASE:=`date '+%Y%m%d'`
MAKETAR = dist
+
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
From cvs at kolab.org Fri Jul 27 12:30:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 12:30:35 +0200 (CEST)
Subject: gunnar: server/perl-kolab Makefile.cvs,1.7,1.8
Message-ID: <20070727103035.79DC36184BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv22913/perl-kolab
Modified Files:
Makefile.cvs
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).
Index: Makefile.cvs
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.cvs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.cvs 6 Nov 2006 13:22:36 -0000 1.7
+++ Makefile.cvs 27 Jul 2007 10:30:33 -0000 1.8
@@ -1,19 +1,24 @@
+PACKAGE=perl-kolab
+#RELEASE=2.5.5
+RELEASE=`date '+%Y%m%d'`
+VERSION:=`grep 'm4_define(_VERSION' $(PWD)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
+
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
ifeq "x$(KOLABCVSDIR)" "x"
KOLABCVSDIR = $(CURDIR)
endif
-PACKAGE=perl-kolab
-#RELEASE=2.5.5
-RELEASE=`date '+%Y%m%d'`
-VERSION:=`grep 'm4_define(_VERSION' $(PWD)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
-
-RPM = /kolab/bin/openpkg rpm
PATH:=/kolab/bin:$(PATH)
From cvs at kolab.org Fri Jul 27 12:30:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 12:30:35 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Archive_Tar Makefile,1.5,1.6
Message-ID: <20070727103035.774486184BD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv22913/pear/PEAR-Archive_Tar
Modified Files:
Makefile
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Archive_Tar/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 23 Jul 2007 17:23:21 -0000 1.5
+++ Makefile 27 Jul 2007 10:30:33 -0000 1.6
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
KOLABRPMPKG = /kolab/RPM/PKG
endif
-
-RPM = /kolab/bin/openpkg rpm
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = /kolab/RPM/TMP
+endif
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
PACKAGE = PEAR-$(PEAR_NAME)
@@ -23,8 +27,8 @@
.PHONY: clean
clean:
- rm -rf /kolab/RPM/TMP/$(PEAR_NAME)*
- rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ rm -rf $(KOLABRPMTMP)/$(PEAR_NAME)*
+ rm -rf $(KOLABRPMTMP)/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
From cvs at kolab.org Fri Jul 27 12:30:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 12:30:35 +0200 (CEST)
Subject: gunnar: server/php-smarty Makefile,1.5,1.6 php-smarty.spec,1.5,1.6
Message-ID: <20070727103035.7E8306184BF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/php-smarty
In directory doto:/tmp/cvs-serv22913/php-smarty
Modified Files:
Makefile php-smarty.spec
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-smarty/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 17 Jul 2007 15:07:15 -0000 1.5
+++ Makefile 27 Jul 2007 10:30:33 -0000 1.6
@@ -1,23 +1,43 @@
-RPM = /kolab/bin/openpkg rpm
NAME = Smarty
PACKAGE = php-smarty
-VERSION = 2.6.18
-RELEASE = 20070607
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
KOLABRELEASE = $(RELEASE)
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-all:
+SOURCE_0=http://smarty.php.net/distributions/$(NAME)-$(VERSION).tar.gz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
+.PHONY: clean
+clean:
+ rm -rf $(KOLABRPMTMP)/$(NAME)*
+ rm -rf $(KOLABRPMTMP)/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
- cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "http://smarty.php.net/distributions/$(NAME)-$(VERSION).tar.gz"
+ cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-dist: all
- cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
-
-binary:
- $(RPM) -bB $(PACKAGE).spec
+ cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
Index: php-smarty.spec
===================================================================
RCS file: /kolabrepository/server/php-smarty/php-smarty.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- php-smarty.spec 17 Jul 2007 15:07:15 -0000 1.5
+++ php-smarty.spec 27 Jul 2007 10:30:33 -0000 1.6
@@ -1,14 +1,14 @@
-# Versions
-%define V_php 5.2.3
-%define V_Smarty 2.6.18
+# Variables
+%define V_version 2.6.18
+%define V_release 20070607
# Package Information
Name: php-smarty
Summary: Template engine for PHP
URL: http://smarty.php.net/
Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB)
-Version: 2.6.18
-Release: 20070607
+Version: %{V_version}
+Release: %{V_release}
Class: JUNK
License: LGPL
Group: Languages
From cvs at kolab.org Fri Jul 27 12:30:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 12:30:35 +0200 (CEST)
Subject: gunnar: server/openldap Makefile,1.19,1.20
Message-ID: <20070727103035.755906184B0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/openldap
In directory doto:/tmp/cvs-serv22913/openldap
Modified Files:
Makefile
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile 17 Jul 2007 16:50:30 -0000 1.19
+++ Makefile 27 Jul 2007 10:30:33 -0000 1.20
@@ -1,26 +1,44 @@
+PACKAGE=openldap
+VERSION=2.3.29
+RELEASE=2.20061110
+KOLABRELEASE=2.20061110_kolab
+
ifeq "x$(KOLABPKGURI)" "x"
KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
endif
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
ifeq "x$(KOLABCVSDIR)" "x"
KOLABCVSDIR = $(CURDIR)
endif
-PACKAGE=openldap
-VERSION=2.3.29
-RELEASE=2.20061110
-KOLABRELEASE=2.20061110_kolab
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
-RPM=/kolab/bin/openpkg rpm
+PATCHES=
+.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
-PATCHES=
+.PHONY: dist
+dist: all
+ cp $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+
+.PHONY: clean
+clean:
+ rm -rf $(KOLABRPMTMP)/$(PACKAGE)
+ rm -rf $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+ rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+ rm -rf *~
$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) $(KOLABCVSDIR)/kolab.patch Makefile
$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -33,8 +51,3 @@
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-dist: all
- cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
-
-clean:
- rm -rf /kolab/RPM/TMP/$(PACKAGE)
From cvs at kolab.org Fri Jul 27 12:30:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 12:30:35 +0200 (CEST)
Subject: gunnar: server/kolab-resource-handlers Makefile,1.15,1.16
Message-ID: <20070727103035.63CE06184AD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-resource-handlers
In directory doto:/tmp/cvs-serv22913/kolab-resource-handlers
Modified Files:
Makefile
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile 20 Dec 2005 09:18:50 -0000 1.15
+++ Makefile 27 Jul 2007 10:30:33 -0000 1.16
@@ -1,12 +1,19 @@
-RPM = /kolab/bin/openpkg rpm
PACKAGE=kolab-resource-handlers
+VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
+RELEASE:=`date '+%Y%m%d'`
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
-RELEASE:=`date '+%Y%m%d'`
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
From cvs at kolab.org Fri Jul 27 12:30:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 12:30:35 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin Makefile,1.9,1.10
Message-ID: <20070727103035.6E15F6184AE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin
In directory doto:/tmp/cvs-serv22913/kolab-webadmin
Modified Files:
Makefile
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile 20 Dec 2005 09:18:50 -0000 1.9
+++ Makefile 27 Jul 2007 10:30:33 -0000 1.10
@@ -1,12 +1,19 @@
-RPM = /kolab/bin/openpkg rpm
PACKAGE=kolab-webadmin
+VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
+RELEASE:=`date '+%Y%m%d'`
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(PACKAGE)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
-RELEASE:=`date '+%Y%m%d'`
all:
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
From cvs at kolab.org Fri Jul 27 17:38:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 17:38:22 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
user.php.in, 1.23, 1.24
Message-ID: <20070727153822.0006E60C4BC@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv31123/kolab-webadmin/kolab-webadmin/www/admin/user
Modified Files:
user.php.in
Log Message:
Reverted kolabAllowSMTPRecipient changes for kolab_2_2_branch:
cvs diff -u -d -r1.19 -r1.20 kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in|patch -p0 -s -R
cvs diff -u -d -r1.13 -r1.14 kolabd/kolabd/templates/slapd.conf.template.in|patch -p0 -s -R
cvs diff -u -d -r1.22 -r1.24 kolabd/kolabd/kolab2.schema|patch -p0 -s -R
Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- user.php.in 12 Jul 2007 16:28:23 -0000 1.23
+++ user.php.in 27 Jul 2007 15:38:19 -0000 1.24
@@ -148,49 +148,6 @@
return '';
}
-function checksmtprecipient ( $form, $key, $value ) {
- $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') );
- $str = '';
- foreach( $lst as $SMTPRecipient ) {
- $trimmed = ltrim($SMTPRecipient, "-."); // potentially every entry is negated with a '-'
- // $SMTPRecipient is either an
- // - email address
- // - local part of an email address with an @ suffix
- // - a domain part
-
- if (! ( valid_email_address($SMTPRecipient)
- | valid_domain($SMTPRecipient)
- | valid_local_part($SMTPRecipient))
- return sprintf(_("Syntax for Recipient %s is invalid"), $SMTPRecipient);
- }
- }
- return '';
-}
-
-
-function valid_email_address($address) {
-// the following addresses are invalid
-// email1.. at kolab.org
-// email1.- at kolab.org
-// email1._ at kolab.org
-// email1 at 2sub.kolab.org
-// email1 at sub.sub.2sub.kolab.org
- return preg_match("/^[a-z]+[a-z0-9]*[\.|\-|_]?[a-z0-9]+@([a-z]+[a-z0-9]*[\.|\-]?[a-z]+[a-z0-9]*[a-z0-9]+){1,4}\.[a-z]{2,4}$/i", $address));
-}
-
-function valid_domain($domain) {
-// the following subdomains are invalid
-// 2sub.kolab.org
-// sub.sub.2sub.kolab.org
- return preg_match("/^[a-z]+[a-z0-9]*[\.|\-]?[a-z]+[a-z0-9]*[a-z0-9]+){1,4}\.[a-z]{2,4}$/i", $domain));
-}
-
-function valid_local_part($local_part) {
- // the local part always has an @ appended
- return preg_match("/^[a-z]+[a-z0-9]*[\.|\-|_]?[a-z0-9]+@/i", $local_part));
-}
-
-
// Check uid/gid used in invitation policy
// We're pretty relaxed about what is entered
// here and only check some basic syntax
@@ -478,12 +435,6 @@
'validation' => 'checkdelegate',
'comment' => _('Others allowed to send emails with a "from" address of this account.') . ' ' .
_('One email address per line.') );
-
-$entries['kolabAllowSMTPRecipient'] =array( 'name' => _('Allowed Recipients'),
- 'type' => 'textarea',
- 'validation' => 'checksmtprecipient',
- 'comment' => _('restrict allowed recipients of SMTP messages') . ' ' .
- _('One entry per line.') );
$entries['title_0'] = array( 'name' => _('Title') );
$entries['o_0'] = array( 'name' => _('Organisation') );
From cvs at kolab.org Fri Jul 27 17:38:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 17:38:22 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates slapd.conf.template.in, 1.14,
1.15
Message-ID: <20070727153822.F335860C4A6@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv31123/kolabd/kolabd/templates
Modified Files:
slapd.conf.template.in
Log Message:
Reverted kolabAllowSMTPRecipient changes for kolab_2_2_branch:
cvs diff -u -d -r1.19 -r1.20 kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in|patch -p0 -s -R
cvs diff -u -d -r1.13 -r1.14 kolabd/kolabd/templates/slapd.conf.template.in|patch -p0 -s -R
cvs diff -u -d -r1.22 -r1.24 kolabd/kolabd/kolab2.schema|patch -p0 -s -R
Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- slapd.conf.template.in 2 Jul 2007 21:17:34 -0000 1.14
+++ slapd.conf.template.in 27 Jul 2007 15:38:19 -0000 1.15
@@ -134,11 +134,6 @@
by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
by * read stop
-access to attrs=kolabAllowSMTPRecipient
- by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
- by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
- by self read stop
-
access to dn="cn=nobody,@@@base_dn@@@"
by anonymous auth stop
From cvs at kolab.org Fri Jul 27 17:38:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 17:38:21 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd kolab2.schema,1.24,1.25
Message-ID: <20070727153821.F2A9F60C4A5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv31123/kolabd/kolabd
Modified Files:
kolab2.schema
Log Message:
Reverted kolabAllowSMTPRecipient changes for kolab_2_2_branch:
cvs diff -u -d -r1.19 -r1.20 kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in|patch -p0 -s -R
cvs diff -u -d -r1.13 -r1.14 kolabd/kolabd/templates/slapd.conf.template.in|patch -p0 -s -R
cvs diff -u -d -r1.22 -r1.24 kolabd/kolabd/kolab2.schema|patch -p0 -s -R
Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- kolab2.schema 2 Jul 2007 21:17:34 -0000 1.24
+++ kolab2.schema 27 Jul 2007 15:38:19 -0000 1.25
@@ -1,23 +1,23 @@
# $Id$
# (c) 2003, 2004 Tassilo Erlewein
-# (c) 2003-2007 Martin Konold
+# (c) 2003-2006 Martin Konold
# (c) 2003 Achim Frank
#
-# Redistribution and use in source and binary forms, with or without
+# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
-# Redistributions of source code must retain the above copyright notice, this
+# Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
#
-# Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
-# The name of the author may not be used to endorse or promote products derived
+# The name of the author may not be used to endorse or promote products derived
# from this software without specific prior written permission.
#
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -123,7 +123,7 @@
# For user, group and resource Kolab accounts
# Describes how to respond to invitations
-# We keep the attribute as a string, but actually it can only have one
+# We keep the attribute as a string, but actually it can only have one
# of the following values:
#
# ACT_ALWAYS_ACCEPT
@@ -171,11 +171,11 @@
SINGLE-VALUE )
# Begin date of Kolab vacation period. Sender will
-# be notified every kolabVacationResendIntervall days
+# be notified every kolabVacationResendIntervall days
# that recipient is absent until kolabVacationEnd.
# Values in this syntax are encoded as printable strings,
-# represented as specified in X.208.
-# Note that the time zone must be specified.
+# represented as specified in X.208.
+# Note that the time zone must be specified.
# For Kolab we limit ourself to GMT
# YYYYMMDDHHMMZ e.g. 200512311458Z.
# see also: rfc 2252.
@@ -270,7 +270,7 @@
NAME 'kolabForwardKeepCopy'
DESC 'Keep copy when forwarding'
EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
# Enable forwarding of UCE.
@@ -296,27 +296,6 @@
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
-# describes the allowed or disallowed smtp addresses for
-# recipients. If this attribute is not set for a user no
-# kolab recipient policy does apply.
-# example entries:
-# .tld - allow mail to every recipient for this tld
-# domain.tld - allow mail to everyone in domain.tld
-# .domain.tld - allow mail to everyone in domain.tld and its subdomains
-# user at domain.tld - allow mail to explicit user at domain.tld
-# user@ - allow mail to this user but any domain
-# -.tld - disallow mail to every recipient for this tld
-# -domain.tld - disallow mail to everyone in domain.tld
-# -.domain.tld - disallow mail to everyone in domain.tld and its subdomains
-# -user at domain.tld - disallow mail to explicit user at domain.tld
-# -user@ - disallow mail to this user but any domain
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.18
- NAME 'kolabAllowSMTPRecipient'
- DESC 'SMTP address allowed for destination (multi-valued)'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{512} )
-
# kolabFolderType describes the kind of Kolab folder
# as defined in the kolab format specification.
# We will annotate all folders with an entry
@@ -384,7 +363,7 @@
attributetype ( 1.3.6.1.4.1.19414.2.1.507
NAME 'postfix-enable-virus-scan'
EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.19414.2.1.508
@@ -514,13 +493,6 @@
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-# Enable the Kolab Policy Daemon. If false or not
-# set don't use the Kolab Policy Daemon
-attributetype ( 1.3.6.1.4.1.19414.2.1.800
- NAME 'kolabPolicyDaemon'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
######################
# proftpd attributes #
######################
@@ -546,7 +518,7 @@
# main kolab server configuration
# storing global values and user specific default values
# like kolabFreeBusyFuture and kolabFreeBusyPast
-objectclass ( 1.3.6.1.4.1.19414.2.2.1
+objectclass ( 1.3.6.1.4.1.19414.2.2.1
NAME 'kolab'
DESC 'Kolab server configuration'
SUP top STRUCTURAL
@@ -575,7 +547,6 @@
kolabfilter-verify-from-header $
kolabfilter-allow-sender-header $
kolabfilter-reject-forged-from-header $
- kolabPolicyDaemon $
proftpd-ftp $
proftpd-defaultquota $
kolabFreeBusyFuture $
@@ -640,7 +611,6 @@
kolabForwardAddress $
kolabForwardKeepCopy $
kolabForwardUCE $
- kolabAllowSMTPRecipient $
kolabDeleteflag $
kolabComment ) )
@@ -665,15 +635,15 @@
alias ) )
# kolab groupOfNames with extra kolabDeleteflag and the required
-# attribute mail.
-# The mail attribute for kolab objects of the type kolabGroupOfNames
-# is not arbitrary but MUST be a single attribute of the form
+# attribute mail.
+# The mail attribute for kolab objects of the type kolabGroupOfNames
+# is not arbitrary but MUST be a single attribute of the form
# of an valid SMTP address with the CN as the local part.
-# E.g cn at kolabdomain (e.g. employees at mydomain.com). The
-# mail attribute MUST be globally unique.
-objectclass ( 1.3.6.1.4.1.19414.3.2.5
- NAME 'kolabGroupOfNames'
- DESC 'Kolab group of names (DNs) derived from RFC2256'
- SUP groupOfNames STRUCTURAL
- MAY ( mail $
+# E.g cn at kolabdomain (e.g. employees at mydomain.com). The
+# mail attribute MUST be globally unique.
+objectclass ( 1.3.6.1.4.1.19414.3.2.5
+ NAME 'kolabGroupOfNames'
+ DESC 'Kolab group of names (DNs) derived from RFC2256'
+ SUP groupOfNames STRUCTURAL
+ MAY ( mail $
kolabDeleteflag ) )
From cvs at kolab.org Fri Jul 27 20:25:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 20:25:22 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.139,1.140
Message-ID: <20070727182522.69E7460C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv3130
Modified Files:
release-notes.txt
Log Message:
Replaced path reference to the kolabconf script by a configuration variable.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- release-notes.txt 26 Jul 2007 15:36:48 -0000 1.139
+++ release-notes.txt 27 Jul 2007 18:25:20 -0000 1.140
@@ -27,12 +27,17 @@
Removed "dirserv"-support.
+ Replaced path reference to the kolabconf script by a
+ configuration variable.
+
- kolabd-2.1.99-2007????:
Added "discard" service to the postfix master.cf configuration.
Removed "dirserv"-support.
+ Replaced path reference to the kolabconf script by a
+ configuration variable.
Changes between 2.1.0 and 2.2-beta1:
From cvs at kolab.org Fri Jul 27 20:25:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 20:25:22 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd kolab.globals.in, NONE, 1.1 ChangeLog,
1.103, 1.104 Makefile.am, 1.27, 1.28 kolab.globals, 1.4, NONE
Message-ID: <20070727182522.6F0CA60C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv3130/kolabd/kolabd
Modified Files:
ChangeLog Makefile.am
Added Files:
kolab.globals.in
Removed Files:
kolab.globals
Log Message:
Replaced path reference to the kolabconf script by a configuration variable.
--- NEW FILE: kolab.globals.in ---
conn_refresh_period : 60
cyrus-admins : manager
cyrus-autocreatequota : 100000
cyrus-imap : TRUE
cyrus-imaps : TRUE
cyrus-pop3 : FALSE
cyrus-pop3s : TRUE
cyrus-sieve : TRUE
directory_mode : slurpd
gyard_deletion_period : 10080
ldap_uri : ldap://127.0.0.1:389
log_level : 2
debug : 0
postfix-mydestination : $mydomain
proftpd-ftp : FALSE
proftpd-userPassword :
sf_field_deleted : kolabdeleteflag
sf_field_guid : entryUUID
sf_field_modified : modifytimestamp
sf_field_quota : cyrus-userquota
sf_object_class : kolabsharedfolder
slurpd_addr : 127.0.0.1
slurpd_accept_addr : 127.0.0.1
slurpd_port : 9999
uid : freebusy
userPassword : freebusy
user_field_deleted : kolabdeleteflag
user_field_guid : entryUUID
user_field_modified : modifytimestamp
user_field_quota : cyrus-userquota
user_object_class : inetOrgPerson
maildefer_size:
maildefer_header:
maildefer_listen: 127.0.0.1:10024
maildefer_talk: 127.0.0.1:10025
kolabconf_script: @kolabconf_script@
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- ChangeLog 26 Jul 2007 15:04:50 -0000 1.103
+++ ChangeLog 27 Jul 2007 18:25:20 -0000 1.104
@@ -1,3 +1,14 @@
+2007-07-27 Gunnar Wrobel
+
+ * kolab.globals.in:
+ * dist_conf/*:
+
+ Added the kolabconf_script variable.
+
+ * Makefile.am (kolab.globals):
+
+ Made kolab.globals a rewritten file (kolab.globals.in)
+
2007-07-26 Gunnar Wrobel
* Makefile.am:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile.am 26 Jul 2007 15:04:50 -0000 1.27
+++ Makefile.am 27 Jul 2007 18:25:20 -0000 1.28
@@ -179,6 +179,12 @@
CLEANFILES += kolab
EXTRA_DIST += kolab.in
+kolab.globals: kolab.globals.in
+ @$(mkinstalldirs) .
+ $(do_subst) <$(srcdir)/kolab.globals.in >$@
+CLEANFILES += kolab.globals
+EXTRA_DIST += kolab.globals.in
+
kolab_ca.sh: kolab_ca.sh.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_ca.sh.in >$@
--- kolab.globals DELETED ---
From cvs at kolab.org Fri Jul 27 20:25:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 20:25:22 +0200 (CEST)
Subject: gunnar: server/perl-kolab ChangeLog,1.18,1.19
Message-ID: <20070727182522.7A40960C4CF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv3130/perl-kolab
Modified Files:
ChangeLog
Log Message:
Replaced path reference to the kolabconf script by a configuration variable.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ChangeLog 26 Jul 2007 15:36:48 -0000 1.18
+++ ChangeLog 27 Jul 2007 18:25:20 -0000 1.19
@@ -1,3 +1,12 @@
+2007-07-27 Gunnar Wrobel
+
+ * Kolab-LDAP-Backend-slurpd/slurpd.pm.in (run):
+
+ Removed explicit reference to the kolabconf script. The path is
+ now read from the Kolab Server configuration. This removes the
+ knowledge that the kolabd package exists from the slurpd.pm
+ script.
+
2007-07-26 Gunnar Wrobel
* Makefile.am:
From cvs at kolab.org Fri Jul 27 20:25:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 20:25:22 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/dist_conf centos-clarkconnect, 1.4,
1.5 common, 1.35, 1.36 debian, 1.9, 1.10 gentoo, 1.9, 1.10 kolab,
1.45, 1.46 mandriva, 1.7, 1.8 suse, 1.58, 1.59
Message-ID: <20070727182522.837AF60C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv3130/kolabd/kolabd/dist_conf
Modified Files:
centos-clarkconnect common debian gentoo kolab mandriva suse
Log Message:
Replaced path reference to the kolabconf script by a configuration variable.
Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- centos-clarkconnect 20 Oct 2006 18:31:42 -0000 1.4
+++ centos-clarkconnect 27 Jul 2007 18:25:20 -0000 1.5
@@ -41,6 +41,7 @@
kolab_rcdir=${sysconfdir}/rc.d/init.d
pkgdocdir=${datadir}/doc/kolab-2.1
+kolabconf_script=${sbindir}/kolabconf
# /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
perllib=/usr/lib/perl5/vendor_perl/5.8.5
Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- common 11 Feb 2007 14:47:51 -0000 1.35
+++ common 27 Jul 2007 18:25:20 -0000 1.36
@@ -105,6 +105,7 @@
-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
-e 's,[@]kolab_webadmin_rpm[@],$(kolab_webadmin_rpm),g' \
+ -e 's,[@]kolabconf_script[@],$(kolabconf_script),g' \
-e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
-e 's,[@]ldapserver_dir[@],$(ldapserver_dir),g' \
Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- debian 19 Jun 2007 06:29:09 -0000 1.9
+++ debian 27 Jul 2007 18:25:20 -0000 1.10
@@ -17,6 +17,7 @@
kolab_rcdir=${sysconfdir}/init.d
pkgdocdir=${datadir}/doc/kolab
+kolabconf_script=${sbindir}/kolabconf
# perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
perllib=${libdir}/perl5
Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gentoo 11 Feb 2007 14:47:51 -0000 1.9
+++ gentoo 27 Jul 2007 18:25:20 -0000 1.10
@@ -43,6 +43,7 @@
# FIXME: Would be nice if we could specify the doc-dir from the outside too.
# But currently the Makefile.am automatically adds the plain package name
pkgdocdir=${datadir}/doc
+kolabconf_script=${sbindir}/kolabconf
fsl_logfile=${localstatedir}/fsl/fsl.log
Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- kolab 20 Jul 2007 20:14:52 -0000 1.45
+++ kolab 27 Jul 2007 18:25:20 -0000 1.46
@@ -20,6 +20,7 @@
kolab_rcdir=${sysconfdir}/rc.d
pkgdocdir=${datadir}/doc
+kolabconf_script=${sbindir}/kolabconf
# /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
perllib=${libdir}/perl/vendor_perl/5.8.8
Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mandriva 9 Mar 2006 21:52:02 -0000 1.7
+++ mandriva 27 Jul 2007 18:25:20 -0000 1.8
@@ -6,6 +6,7 @@
restricted_kolab_grp=kolab # kolab-r
rcdir=${sysconfdir}/rc
+kolabconf_script=${sbindir}/kolabconf
kolabd_usr=root
kolab_statedir = ${localstatedir}/kolab
Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- suse 27 Jun 2007 12:08:32 -0000 1.58
+++ suse 27 Jul 2007 18:25:20 -0000 1.59
@@ -20,6 +20,7 @@
kolab_rcdir=${sysconfdir}/init.d
pkgdocdir=${datadir}/doc/packages/kolab
+kolabconf_script=${sbindir}/kolabconf
# perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
perllib=${libdir}/perl5/vendor_perl/5.8.7
From cvs at kolab.org Fri Jul 27 20:25:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 20:25:22 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend-slurpd slurpd.pm.in, 1.2,
1.3
Message-ID: <20070727182522.7C34660C4D0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd
In directory doto:/tmp/cvs-serv3130/perl-kolab/Kolab-LDAP-Backend-slurpd
Modified Files:
slurpd.pm.in
Log Message:
Replaced path reference to the kolabconf script by a configuration variable.
Index: slurpd.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd/slurpd.pm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- slurpd.pm.in 9 Apr 2006 22:49:43 -0000 1.2
+++ slurpd.pm.in 27 Jul 2007 18:25:20 -0000 1.3
@@ -279,11 +279,11 @@
if( !($select->can_read(1)) ) {
$changes = 0;
Kolab::log('SD', 'Change detected w/ no pending LDAP messages; reloading services if needed');
- Kolab::LDAP::sync;
- Kolab::log('SD', 'Running kolabconf');
- system("@sbindir@/kolabconf") == 0
- or Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
- Kolab::log('SD', 'Kolabconf complete');
+ Kolab::LDAP::sync;
+ Kolab::log('SD', "Running $Kolab::config{'kolabconf_script'}");
+ system($Kolab::config{'kolabconf_script'}) == 0
+ or Kolab::log('SD', "Failed to run $Kolab::config{'kolabconf_script'}: $?", KOLAB_ERROR);
+ Kolab::log('SD', "$Kolab::config{'kolabconf_script'} complete");
}
}
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/horde/horde .cvsignore,NONE,1.1
Message-ID: <20070727195046.190A5600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv5191/horde/horde
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp .cvsignore,NONE,1.1
Message-ID: <20070727195046.1F86260C4C5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv5191/horde/horde-imp
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd .cvsignore,NONE,1.1
Message-ID: <20070727195046.3172760C4D5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv5191/horde/horde-passwd
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework .cvsignore,NONE,1.1
Message-ID: <20070727195046.1CB5F60C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv5191/horde/horde-framework
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba .cvsignore,NONE,1.1
Message-ID: <20070727195046.3432C60C4D6@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv5191/horde/horde-turba
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/horde/horde-kolab-client .cvsignore,NONE,1.1
Message-ID: <20070727195046.2534360C4CF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kolab-client
In directory doto:/tmp/cvs-serv5191/horde/horde-kolab-client
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag .cvsignore,NONE,1.1
Message-ID: <20070727195046.2DF9560C4D4@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv5191/horde/horde-nag
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo .cvsignore,NONE,1.1
Message-ID: <20070727195046.2AFE560C4D1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv5191/horde/horde-mnemo
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Date .cvsignore,NONE,1.1
Message-ID: <20070727195046.3BF4A60C4DA@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Date
In directory doto:/tmp/cvs-serv5191/pear/PEAR-Date
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Socket .cvsignore,NONE,1.1
Message-ID: <20070727195046.4AC7C60C4DE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv5191/pear/PEAR-Net_Socket
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Console_Getopt .cvsignore,NONE,1.1
Message-ID: <20070727195046.3987E60C4D9@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv5191/pear/PEAR-Console_Getopt
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail .cvsignore,NONE,1.1
Message-ID: <20070727195046.40BAD60C4DC@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail
In directory doto:/tmp/cvs-serv5191/pear/PEAR-Mail
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Log .cvsignore,NONE,1.1
Message-ID: <20070727195046.3E91D60C4DB@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv5191/pear/PEAR-Log
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Archive_Tar .cvsignore,NONE,1.1
Message-ID: <20070727195046.351D360C4D7@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv5191/pear/PEAR-Archive_Tar
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo .cvsignore,NONE,1.1
Message-ID: <20070727195046.2253060C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv5191/horde/horde-ingo
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail_Mime .cvsignore,NONE,1.1
Message-ID: <20070727195046.4362A60C4DD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv5191/pear/PEAR-Mail_Mime
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/php-smarty .cvsignore,NONE,1.1
Message-ID: <20070727195046.4DC8460C4DF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/php-smarty
In directory doto:/tmp/cvs-serv5191/php-smarty
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith .cvsignore,NONE,1.1
Message-ID: <20070727195046.27F2B60C4D0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv5191/horde/horde-kronolith
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Auth_SASL .cvsignore,NONE,1.1
Message-ID: <20070727195046.37C8B60C4D8@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv5191/pear/PEAR-Auth_SASL
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 21:50:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 21:50:46 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Sieve .cvsignore,NONE,1.1
Message-ID: <20070727195046.45BF1600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv5191/pear/PEAR-Net_Sieve
Added Files:
.cvsignore
Log Message:
Ignore source RPM files in these directories.
--- NEW FILE: .cvsignore ---
*.src.rpm
From cvs at kolab.org Fri Jul 27 22:28:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 22:28:33 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.140,1.141
Message-ID: <20070727202833.6BAF7600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv6516
Modified Files:
release-notes.txt
Log Message:
Replaced statedir path with function argument in Kolab::LDAP::startup.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- release-notes.txt 27 Jul 2007 18:25:20 -0000 1.140
+++ release-notes.txt 27 Jul 2007 20:28:31 -0000 1.141
@@ -30,6 +30,8 @@
Replaced path reference to the kolabconf script by a
configuration variable.
+ Replaced statedir path with function argument.
+
- kolabd-2.1.99-2007????:
Added "discard" service to the postfix master.cf configuration.
@@ -38,6 +40,8 @@
Replaced path reference to the kolabconf script by a
configuration variable.
+
+ Replaced statedir path with function argument in Kolab::LDAP::startup.
Changes between 2.1.0 and 2.2-beta1:
From cvs at kolab.org Fri Jul 27 22:28:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 22:28:33 +0200 (CEST)
Subject: gunnar: server/perl-kolab ChangeLog,1.19,1.20
Message-ID: <20070727202833.784C460C4CD@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv6516/perl-kolab
Modified Files:
ChangeLog
Log Message:
Replaced statedir path with function argument in Kolab::LDAP::startup.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ChangeLog 27 Jul 2007 18:25:20 -0000 1.19
+++ ChangeLog 27 Jul 2007 20:28:31 -0000 1.20
@@ -1,5 +1,11 @@
2007-07-27 Gunnar Wrobel
+ * Kolab-LDAP/LDAP.pm.in (startup):
+
+ Require that the startup call is provided with the path to the
+ statedir. This way we remove knowledge of the kolabd package from
+ LDAP.pm script
+
* Kolab-LDAP-Backend-slurpd/slurpd.pm.in (run):
Removed explicit reference to the kolabconf script. The path is
From cvs at kolab.org Fri Jul 27 22:28:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 22:28:33 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd kolabquotareport.in, NONE, 1.1 ChangeLog,
1.104, 1.105 Makefile.am, 1.28, 1.29 kolab_upgrade.in, 1.2,
1.3 kolabd.in, 1.4, 1.5 kolabquotawarn.in, 1.10,
1.11 kolabquotareport, 1.1.1.1, NONE
Message-ID: <20070727202833.74D5560C4BE@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv6516/kolabd/kolabd
Modified Files:
ChangeLog Makefile.am kolab_upgrade.in kolabd.in
kolabquotawarn.in
Added Files:
kolabquotareport.in
Removed Files:
kolabquotareport
Log Message:
Replaced statedir path with function argument in Kolab::LDAP::startup.
--- NEW FILE: kolabquotareport.in ---
(This appears to be a binary file; contents omitted.)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- ChangeLog 27 Jul 2007 18:25:20 -0000 1.104
+++ ChangeLog 27 Jul 2007 20:28:31 -0000 1.105
@@ -1,5 +1,17 @@
2007-07-27 Gunnar Wrobel
+ * kolabquotareport.in:
+ * kolabquotawarn.in:
+ * kolabd.in:
+ * kolab_upgrade.in:
+
+ Added statedir variable to the LDAP startup call.
+
+ * Makefile.am (kolabquotareport):
+
+ Made kolabquotareport a rewritten file (kolabquotareport.in)
+ The file does not get installed though.
+
* kolab.globals.in:
* dist_conf/*:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am 27 Jul 2007 18:25:20 -0000 1.28
+++ Makefile.am 27 Jul 2007 20:28:31 -0000 1.29
@@ -240,6 +240,13 @@
CLEANFILES += kolabquotawarn
EXTRA_DIST += kolabquotawarn.in
+kolabquotareport: kolabquotareport.in
+ @$(mkinstalldirs) .
+ $(do_subst) <$(srcdir)/kolabquotareport.in >$@
+ chmod a+x kolabquotareport
+CLEANFILES += kolabquotareport
+EXTRA_DIST += kolabquotareport.in
+
kolabdcachetool: kolabdcachetool.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabdcachetool.in >$@
Index: kolab_upgrade.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_upgrade.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab_upgrade.in 27 Nov 2005 23:57:02 -0000 1.2
+++ kolab_upgrade.in 27 Jul 2007 20:28:31 -0000 1.3
@@ -10,7 +10,7 @@
use Kolab::Util;
use Kolab::LDAP;
-Kolab::LDAP::startup;
+Kolab::LDAP::startup("@kolab_statedir@");
# Utility functions
sub getLdapEntry {
Index: kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolabd.in 26 Jul 2007 15:04:50 -0000 1.4
+++ kolabd.in 27 Jul 2007 20:28:31 -0000 1.5
@@ -149,7 +149,7 @@
Kolab::Util::superLog('Kolab is starting up');
eval {
- Kolab::LDAP::startup;
+ Kolab::LDAP::startup("@kolab_statedir@");
Kolab::log('K', 'Loading backends');
Kolab::LDAP::Backend::load;
Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolabquotawarn.in 9 Mar 2006 21:35:08 -0000 1.10
+++ kolabquotawarn.in 27 Jul 2007 20:28:31 -0000 1.11
@@ -42,7 +42,7 @@
use File::Basename;
use vars qw($opt_d);
-Kolab::LDAP::startup;
+Kolab::LDAP::startup("@kolab_statedir@");
getopts('d');
if ($opt_d) {
--- kolabquotareport DELETED ---
From cvs at kolab.org Fri Jul 27 22:28:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 27 Jul 2007 22:28:33 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP LDAP.pm.in,1.8,1.9
Message-ID: <20070727202833.7BF4260C4CF@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP
In directory doto:/tmp/cvs-serv6516/perl-kolab/Kolab-LDAP
Modified Files:
LDAP.pm.in
Log Message:
Replaced statedir path with function argument in Kolab::LDAP::startup.
Index: LDAP.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- LDAP.pm.in 26 Jul 2007 15:17:56 -0000 1.8
+++ LDAP.pm.in 27 Jul 2007 20:28:31 -0000 1.9
@@ -69,30 +69,32 @@
sub startup
{
+ my $statedir = shift;
+
Kolab::log('L', 'Starting up');
Kolab::log('L', 'Opening mailbox uid cache DB');
- if (!dbmopen(%uid_db, "@kolab_statedir@/mailbox-uidcache.db", 0666)) {
+ if (!dbmopen(%uid_db, "$statedir/mailbox-uidcache.db", 0666)) {
Kolab::log('L', 'Unable to open mailbox uid cache DB', KOLAB_ERROR);
exit(1);
}
Kolab::log('L', 'Opening graveyard uid/timestamp cache DB');
- if (!dbmopen(%gyard_db, "@kolab_statedir@/graveyard-uidcache.db", 0666)) {
+ if (!dbmopen(%gyard_db, "$statedir/graveyard-uidcache.db", 0666)) {
Kolab::log('L', 'Unable to open graveyard uid cache DB', KOLAB_ERROR);
exit(1);
}
- if (!dbmopen(%gyard_ts_db, "@kolab_statedir@/graveyard-tscache.db", 0666)) {
+ if (!dbmopen(%gyard_ts_db, "$statedir/graveyard-tscache.db", 0666)) {
Kolab::log('L', 'Unable to open graveyard timestamp cache DB', KOLAB_ERROR);
exit(1);
}
Kolab::log('L', 'Opening mailbox quota cache DB');
- if (!dbmopen(%quota_db, "@kolab_statedir@/mailbox-quotacache.db", 0666)) {
+ if (!dbmopen(%quota_db, "$statedir/mailbox-quotacache.db", 0666)) {
Kolab::log('L', 'Unable to open mailbox quota cache DB', KOLAB_ERROR);
exit(1);
}
@@ -351,12 +353,6 @@
.' all']);
}
}
-# if( $p ne 'sf' ) {
-# # Create FB dir for user
-# my $fbdir = '@webserver_document_root@/freebusy/'.$uid;
-# mkdir( $fbdir, 0750);
-# chown( $Kolab::config{'kolab_n_uid'},$Kolab::config{'kolab_n_gid'},$fbdir );
-# }
}
}
@@ -506,11 +502,6 @@
}
Kolab::Cyrus::deleteMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0));
-# if( $p ne 'sf' ) {
-# # Create FB dir for user
-# my $fbdir = '@webserver_document_root@/freebusy/'.$uid;
-# system("rm -rf \"$fbdir\"" );
-# }
delete $uid_db{$guid};
delete $quota_db{$guid};
return 1;
From cvs at kolab.org Tue Jul 31 13:54:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 31 Jul 2007 13:54:35 +0200 (CEST)
Subject: gunnar: server/perl-kolab ChangeLog,1.20,1.21
Message-ID: <20070731115435.B4A2360C4D0@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv26549/perl-kolab
Modified Files:
ChangeLog
Log Message:
Removed knowledge of the kolabd package from the Kolab.pm script.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ChangeLog 27 Jul 2007 20:28:31 -0000 1.20
+++ ChangeLog 31 Jul 2007 11:54:33 -0000 1.21
@@ -1,3 +1,15 @@
+2007-07-31 Gunnar Wrobel
+
+ * Kolab/Kolab.pm.in:
+ * Kolab-Conf/Conf.pm.in:
+
+ Require that the configuration load call is provided with the path
+ to the global Kolab configuration settings. This way we remove the
+ knowledge that the kolabd package exist from the Kolab.pm script.
+
+ In addition the reload() function was moved to the Conf.pm
+ module.
+
2007-07-27 Gunnar Wrobel
* Kolab-LDAP/LDAP.pm.in (startup):
From cvs at kolab.org Tue Jul 31 13:54:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 31 Jul 2007 13:54:35 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Conf Conf.pm.in,1.12,1.13
Message-ID: <20070731115435.B882E60C4D4@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv26549/perl-kolab/Kolab-Conf
Modified Files:
Conf.pm.in
Log Message:
Removed knowledge of the kolabd package from the Kolab.pm script.
Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Conf.pm.in 17 Jul 2007 15:07:15 -0000 1.12
+++ Conf.pm.in 31 Jul 2007 11:54:33 -0000 1.13
@@ -49,7 +49,6 @@
&buildLDAPReplicas
&rebuildTemplates
&checkPermissions
- %haschanged
) ]
);
@@ -76,99 +75,7 @@
my %ownership = ();
my %permissions = ();
my %templatehaschanged = ();
-
-# my %templates = (
-# "$templatedir/rc.conf.template" => "@sysconfdir@/rc.conf",
-# "$templatedir/session_vars.php.template" => "@phplibdir2@/admin/include/session_vars.php",
-# "$templatedir/clamd.conf.template" => "@clamav_confdir@/clamd.conf",
-# "$templatedir/freshclam.conf.template" => "@clamav_confdir@/freshclam.conf",
-# "$templatedir/amavisd.conf.template" => "@amavisd_conffile@",
-# "$templatedir/main.cf.template" => "@emailserver_confdir@/main.cf@",
-# "$templatedir/ldapdistlist.cf.template" => "@emailserver_confdir@/ldapdistlist.cf",
-# "$templatedir/ldaptransport.cf.template" => "@emailserver_confdir@/ldaptransport.cf",
-# "$templatedir/ldapvirtual.cf.template" => "@emailserver_confdir@/ldapvirtual.cf",
-# "$templatedir/master.cf.template" => "@emailserver_confdir@/master.cf",
-# "$templatedir/transport.template" => "@emailserver_confdir@/transport",
-# "$templatedir/virtual.template" => "@emailserver_confdir@/virtual",
-# "$templatedir/saslauthd.conf.template" => "@sasl_authdconffile@",
-# "$templatedir/imapd.conf.template" => "@imap_confdir@/imapd.conf",
-# "$templatedir/imapd.group.template" => "@imap_confdir@/imapd.group",
-# "$templatedir/cyrus.conf.template" => "@imap_confdir@/cyrus.conf",
-# "$templatedir/httpd.conf.template" => "@webserver_confdir@/apache.conf",
-# "$templatedir/httpd.local.template" => "@webserver_confdir@/apache.local",
-# "$templatedir/php.ini.template" => "@phpini_dir@/php.ini",
-# "$templatedir/proftpd.conf.template" => "@ftpserver_confdir@/proftpd.conf",
-# "$templatedir/ldap.conf.template" => "@sysconfdir@/openldap/ldap.conf",
-# "$templatedir/slapd.conf.template" => "@sysconfdir@/openldap/slapd.conf",
-# "$templatedir/slapd.access.template" => "@sysconfdir@/openldap/slapd.access",
-# "$templatedir/slapd.replicas.template" => "@sysconfdir@/openldap/slapd.replicas",
-# "$templatedir/DB_CONFIG.slapd.template" => "@ldapserver_dir@/DB_CONFIG",
-# "$templatedir/freebusy.conf.template" => "@resmgr_confdir@/freebusy.conf",
-# "$templatedir/fbview.conf.template" => "@resmgr_confdir@/fbview.conf",
-# "$templatedir/resmgr.conf.template" => "@resmgr_confdir@/resmgr.conf"
-# );
-
-# my %permissions = (
-# "@sysconfdir@/rc.conf" => 0644,
-# "@phplibdir2@/admin/include/session_vars.php" => 0640,
-# "@resmgr_confdir@/freebusy.conf" => 0640,
-# "@resmgr_confdir@/fbview.conf" => 0640,
-# "@resmgr_confdir@/resmgr.conf" => 0640,
-# "@emailserver_confdir@/main.cf" => 0644,
-# "@emailserver_confdir@/ldapdistlist.cf" => 0640,
-# "@emailserver_confdir@/ldaptransport.cf" => 0640,
-# "@emailserver_confdir@/ldapvirtual.cf" => 0640,
-# "@emailserver_confdir@/master.cf" => 0640,
-# "@clamav_confdir@/clamd.conf" => 0640,
-# "@clamav_confdir@/freshclam.conf" => 0640,
-# "@sysconfdir@/amavisd/amavisd.conf" => 0640,
-# "@sasl_authdconffile@" => 0600,
-# "@imap_confdir@/imapd.conf" => oct('@imap_confperm@'),
-# "@webserver_confdir@/apache.conf" => 0640,
-# "@webserver_confdir@/apache.local" => 0640,
-# "@phpini_dir@/php.ini" => 0640,
-# "@ftpserver_confdir@/proftpd.conf" => 0640,
-# "@sysconfdir@/openldap/slapd.conf" => 0640,
-# "@sysconfdir@/openldap/slapd.access" => 0640,
-# "@sysconfdir@/openldap/slapd.replicas" => 0640,
-# "@ldapserver_dir@/DB_CONFIG" => 0640,
-# "@sysconfdir@/openldap/ldap.conf" => 0644,
-# "@emailserver_confdir@/transport" => 0640,
-# "@emailserver_confdir@/virtual" => 0640,
-# "@imap_confdir@/cyrus.conf" => oct('@imap_confperm@'),
-# "@imap_confdir@/imapd.group" => oct('@imap_confperm@'));
-
-# my %ownership = (
-# "@sysconfdir@/rc.conf" => "kolab:kolab",
-# "@phplibdir2@/admin/include/session_vars.php" => "kolab:kolab-n",
-# "@resmgr_confdir@/freebusy.conf" => "kolab:kolab-n",
-# "@resmgr_confdir@/fbview.conf" => "kolab:kolab-n",
-# "@resmgr_confdir@/resmgr.conf" => "kolab:kolab-n",
-# "@emailserver_confdir@/main.cf" => "@emailserver_usr@:@emailserver_grp@",
-# "@emailserver_confdir@/ldapdistlist.cf" => "@emailserver_usr@:@emailserver_grp@",
-# "@emailserver_confdir@/ldaptransport.cf" => "@emailserver_usr@:@emailserver_grp@",
-# "@emailserver_confdir@/ldapvirtual.cf" => "@emailserver_usr@:@emailserver_grp@",
-# "@emailserver_confdir@/master.cf" => "@emailserver_usr@:@emailserver_grp@",
-# "@clamav_confdir@/clamd.conf" => "kolab:kolab-r",
-# "@clamav_confdir@/freshclam.conf" => "kolab:kolab-r",
-# "@amavisd_conffile@" => "kolab:kolab-r",
-# "@sasl_authdconffile@" => "kolab:kolab",
-# "@imap_confdir@/imapd.conf" => "@imap_usr@:@imap_grp@",
-# "@webserver_confdir@/apache.conf" => "kolab:kolab-n",
-# "@webserver_confdir@/apache.local" => "kolab:kolab-n",
-# "@phpini_dir/php.ini" => "kolab:kolab-n",
-# "@ftpserver_confdir@/proftpd.conf" => "kolab:kolab-n",
-# "@sysconfdir@/openldap/ldap.conf" => "@ldapserver_usr@:@ldapserver_grp@",
-# "@sysconfdir@/openldap/slapd.conf" => "@ldapserver_usr@:@ldapserver_grp@",
-# "@sysconfdir@/openldap/slapd.access" => "@ldapserver_usr@:@ldapserver_grp@",
-# "@sysconfdir@/openldap/slapd.replicas" => "@ldapserver_usr@:@ldapserver_grp@",
-# "@ldapserver_dir@/DB_CONFIG" => "@ldapserver_usr@:@ldapserver_grp@",
-# "@emailserver_confdir@/transport" => "@emailserver_usr@:@emailserver_grp@",
-# "@emailserver_confdir@/virtual" => "@emailserver_usr@:@emailserver_grp@",
-# "@imap_confdir@/cyrus.conf" => "@imap_usr@:@imap_grp@",
-# "@imap_confdir@/imapd.group" => "@imap_usr@:@imap_grp@");
-
-
+my %haschanged = ();
sub fixup {
my $file = shift;
@@ -325,21 +232,21 @@
chomp($rc);
if ($rc) {
if ($cfg =~ /postfix/) {
- $Kolab::haschanged{'postfix'} = 1;
+ $haschanged{'postfix'} = 1;
} elsif ($cfg =~ /saslauthd/) {
- $Kolab::haschanged{'saslauthd'} = 1;
+ $haschanged{'saslauthd'} = 1;
} elsif ($cfg =~ /apache2/) {
- $Kolab::haschanged{'apache2'} = 1;
+ $haschanged{'apache2'} = 1;
} elsif ($cfg =~ /proftpd/) {
- $Kolab::haschanged{'proftpd'} = 1;
+ $haschanged{'proftpd'} = 1;
} elsif ($cfg =~ /openldap/) {
- $Kolab::haschanged{'slapd'} = 1;
+ $haschanged{'slapd'} = 1;
} elsif ($cfg =~ /imapd/) {
- $Kolab::haschanged{'imapd'} = 1;
+ $haschanged{'imapd'} = 1;
} elsif ($cfg =~ /amavisd/) {
- $Kolab::haschanged{'amavisd'} = 1;
+ $haschanged{'amavisd'} = 1;
} elsif ($cfg =~ /clamav/) {
- $Kolab::haschanged{'clamav'} = 1;
+ $haschanged{'clamav'} = 1;
#} elsif ($cfg =~ /example/) {
} else {
Kolab::log('T', "`$cfg' change detected ", KOLAB_DEBUG );
@@ -428,10 +335,10 @@
chomp($rc);
if ($rc) {
Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
- $Kolab::haschanged{'postfix'} = 1;
+ $haschanged{'postfix'} = 1;
}
} else {
- $Kolab::haschanged{'postfix'} = 1;
+ $haschanged{'postfix'} = 1;
}
Kolab::log('T', 'Finished building Postfix $map map', KOLAB_DEBUG);
@@ -507,10 +414,10 @@
chomp($rc);
if ($rc) {
Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
- $Kolab::haschanged{'imapd'} = 1;
+ $haschanged{'imapd'} = 1;
}
} else {
- $Kolab::haschanged{'imapd'} = 1;
+ $haschanged{'imapd'} = 1;
}
Kolab::log('T', 'Finished building Cyrus config', KOLAB_DEBUG);
@@ -668,10 +575,10 @@
chomp($rc);
if ($rc) {
Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
- $Kolab::haschanged{'slapd'} = 1;
+ $haschanged{'slapd'} = 1;
}
} else {
- $Kolab::haschanged{'slapd'} = 1;
+ $haschanged{'slapd'} = 1;
}
fixup( $cfg, $ownership{$cfg}, $permissions{$cfg});
@@ -723,10 +630,10 @@
chomp($rc);
if ($rc) {
Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
- $Kolab::haschanged{'slapd'} = 1;
+ $haschanged{'slapd'} = 1;
}
} else {
- $Kolab::haschanged{'slapd'} = 1;
+ $haschanged{'slapd'} = 1;
}
Kolab::log('T', 'Finished building LDAP replicas', KOLAB_DEBUG);
@@ -868,6 +775,61 @@
}
}
return $ok;
+}
+
+sub reload
+{
+ if ($haschanged{'slapd'}) {
+ &log('K', 'Restarting OpenLDAP...');
+ system("@KOLABRC@ rc openldap restart &");
+ }
+
+ if ($haschanged{'saslauthd'}) {
+ &log('K', 'Restarting SASLAuthd...');
+ system("@KOLABRC@ rc sasl stop; sleep 1; @sbindir@/saslauthd -a ldap -n 5");
+ }
+
+ if ($haschanged{'apache'}) {
+ &log('K', 'Reloading Apache...');
+ system("@sbindir@/apachectl graceful");
+ }
+
+ if ($haschanged{'postfix'}) {
+ &log('K', 'Reloading Postfix...');
+ system("@sbindir@/postfix reload");
+ }
+
+ if ($haschanged{'imapd'}) {
+ &log('K', 'Restarting imapd...');
+ # Would it be enough with a reload here? /steffen
+ system("@KOLABRC@ rc imapd restart");
+ }
+
+ if ($haschanged{'amavisd'}) {
+ &log('K', 'Restarting amavisd...');
+ system("@KOLABRC@ rc amavisd restart");
+ }
+
+ if ($haschanged{'clamav'}) {
+ &log('K', 'Restarting clamav...');
+ system("@KOLABRC@ rc clamav restart");
+ }
+
+ if ($Kolab::config{'proftpd-ftp'} =~ /true/i) {
+ Kolab::log('K', 'Starting ProFTPd if not running');
+ system("@KOLABRC@ rc proftpd start");
+ if ($haschanged{'proftpd'}) {
+ &log('K', 'Reloading ProFTPd...');
+ kill('SIGHUP', `cat @ftpserver_pidfile@`);
+ }
+ } else {
+ &log('K', 'Stopping ProFTPd, if running...');
+ system("@KOLABRC@ rc proftpd stop");
+ }
+
+ %Kolab::Conf::haschanged = ();
+
+ &log('K', 'Reload finished');
}
1;
From cvs at kolab.org Tue Jul 31 13:54:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 31 Jul 2007 13:54:35 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab Kolab.pm.in,1.7,1.8
Message-ID: <20070731115435.B640B60C4D2@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab
In directory doto:/tmp/cvs-serv26549/perl-kolab/Kolab
Modified Files:
Kolab.pm.in
Log Message:
Removed knowledge of the kolabd package from the Kolab.pm script.
Index: Kolab.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Kolab.pm.in 26 Jul 2007 15:17:56 -0000 1.7
+++ Kolab.pm.in 31 Jul 2007 11:54:33 -0000 1.8
@@ -27,7 +27,7 @@
use Net::LDAP;
use Kolab::Util;
#use Kolab::LDAP;
-use vars qw(%config %haschanged $reloadOk);
+use vars qw(%config $reloadOk);
require Exporter;
@@ -63,6 +63,8 @@
sub reloadConfig
{
+ my $kolab_globals = shift;
+
my $tempval;
my $ldap;
@@ -76,23 +78,25 @@
# 3 - Info, Warnings & Errors (DEFAULT)
# 4 - Debug (i.e. everything)
+ # First read `kolab.globals'
+ %config = readConfig(%config, $kolab_globals);
+
# Determine the root of the kolab installation, and read `kolab.globals'
# Notice that the location of the files is handled by dist_conf,
# so we don't use $tempval for anything other than storing it in
# $config{'prefix'}. Once prefix is not in use anywhere, we can remove
# this code. /steffen
- $tempval = (getpwnam('@kolab_musr@'))[7];
+ $tempval = (getpwnam($config{'kolab_musr'}))[7];
if (! defined $tempval) {
$config{'log_level'} = KOLAB_WARN;
&log('C', 'Unable to determine the kolab user main directory', KOLAB_ERROR);
$error = 1;
} else {
- %config = readConfig(%config, "@sysconfdir@/kolab/kolab.globals");
- $config{'prefix'} = $tempval;
+ $config{'prefix'} = $tempval;
}
# Now read `kolab.conf', overwriting values read from `kolab.globals'
- %config = readConfig(\%config, "@sysconfdir@/kolab/kolab.conf");
+ %config = readConfig(\%config, $config{'kolab_locals'});
$config{'debug'} = 0 if (!exists $config{'debug'});
$config{'log_level'} = KOLAB_WARN if (!exists $config{'log_level'});
@@ -100,39 +104,39 @@
&log('C', 'Reloading configuration');
# Get the UID/GID of the 'kolab' users
- $config{'kolab_uid'} = (getpwnam('@kolab_musr@'))[2];
+ $config{'kolab_uid'} = (getpwnam($config{'kolab_musr'}))[2];
if (!defined $config{'kolab_uid'}) {
- &log('C', "Unable to determine the uid of user '@kolab_musr@'", KOLAB_ERROR);
+ &log('C', "Unable to determine the uid of user '$config{'kolab_musr'}'", KOLAB_ERROR);
$error = 1;
}
- $config{'kolab_gid'} = (getgrnam('@kolab_mgrp@'))[2];
+ $config{'kolab_gid'} = (getgrnam($config{'kolab_mgrp'}))[2];
if (!defined $config{'kolab_gid'}) {
- &log('C', "Unable to determine the gid of user '@kolab_mgrp@'", KOLAB_ERROR);
+ &log('C', "Unable to determine the gid of user '$config{'kolab_mgrp'}'", KOLAB_ERROR);
$error = 1;
}
- $config{'kolab_n_uid'} = (getpwnam('@kolab_usr@'))[2];
+ $config{'kolab_n_uid'} = (getpwnam($config{'kolab_usr'}))[2];
if (!defined $config{'kolab_n_uid'}) {
- &log('C', "Unable to determine the uid of user '@kolab_usr@'", KOLAB_ERROR);
+ &log('C', "Unable to determine the uid of user '$config{'kolab_usr'}", KOLAB_ERROR);
$error = 1;
}
- $config{'kolab_n_gid'} = (getgrnam('@kolab_grp@'))[2];
+ $config{'kolab_n_gid'} = (getgrnam($config{'kolab_grp'}))[2];
if (!defined $config{'kolab_n_gid'}) {
- &log('C', "Unable to determine the gid of user @kolab_grp@'", KOLAB_ERROR);
+ &log('C', "Unable to determine the gid of user $config{'kolab_grp'}", KOLAB_ERROR);
$error = 1;
}
- $config{'kolab_r_uid'} = (getpwnam('@kolab_rusr@'))[2];
+ $config{'kolab_r_uid'} = (getpwnam($config{'kolab_rusr'}))[2];
if (!defined $config{'kolab_r_uid'}) {
- &log('C', "Unable to determine the uid of user '@kolab_rusr@'", KOLAB_ERROR);
+ &log('C', "Unable to determine the uid of user '$config{'kolab_rusr'}'", KOLAB_ERROR);
$error = 1;
}
- $config{'kolab_r_gid'} = (getgrnam('@kolab_rgrp@'))[2];
+ $config{'kolab_r_gid'} = (getgrnam($config{'kolab_rgrp'}))[2];
if (!defined $config{'kolab_r_gid'}) {
- &log('C', "Unable to determine the gid of user '@kolab_rgrp@'", KOLAB_ERROR);
+ &log('C', "Unable to determine the gid of user '$config{'kolab_rgrp'}'", KOLAB_ERROR);
$error = 1;
}
@@ -144,7 +148,7 @@
# Make a hash of the bind password available too
if( !exists $config{'bind_pw_hash'} ) {
- my $hashcmd = "@sbindir@/slappasswd -s '".$config{'bind_pw'}."'";
+ my $hashcmd = $config{'hashmethod'} . " '".$config{'bind_pw'}."'";
$config{'bind_pw_hash'} = `$hashcmd`;
chomp($config{'bind_pw_hash'});
}
@@ -393,61 +397,6 @@
$reloadOk = !$error;
}
-sub reload
-{
- if ($haschanged{'slapd'}) {
- &log('K', 'Restarting OpenLDAP...');
- system("@KOLABRC@ rc openldap restart &");
- }
-
- if ($haschanged{'saslauthd'}) {
- &log('K', 'Restarting SASLAuthd...');
- system("@KOLABRC@ rc sasl stop; sleep 1; @sbindir@/saslauthd -a ldap -n 5");
- }
-
- if ($haschanged{'apache'}) {
- &log('K', 'Reloading Apache...');
- system("@sbindir@/apachectl graceful");
- }
-
- if ($haschanged{'postfix'}) {
- &log('K', 'Reloading Postfix...');
- system("@sbindir@/postfix reload");
- }
-
- if ($haschanged{'imapd'}) {
- &log('K', 'Restarting imapd...');
- # Would it be enough with a reload here? /steffen
- system("@KOLABRC@ rc imapd restart");
- }
-
- if ($haschanged{'amavisd'}) {
- &log('K', 'Restarting amavisd...');
- system("@KOLABRC@ rc amavisd restart");
- }
-
- if ($haschanged{'clamav'}) {
- &log('K', 'Restarting clamav...');
- system("@KOLABRC@ rc clamav restart");
- }
-
- if ($config{'proftpd-ftp'} =~ /true/i) {
- Kolab::log('K', 'Starting ProFTPd if not running');
- system("@KOLABRC@ rc proftpd start");
- if ($haschanged{'proftpd'}) {
- &log('K', 'Reloading ProFTPd...');
- kill('SIGHUP', `cat @ftpserver_pidfile@`);
- }
- } else {
- &log('K', 'Stopping ProFTPd, if running...');
- system("@KOLABRC@ rc proftpd stop");
- }
-
- %Kolab::Conf::haschanged = ();
-
- &log('K', 'Reload finished');
-}
-
sub log
{
my $prefix = shift;
@@ -469,8 +418,6 @@
}
print STDERR "$text\n" if ($config{'debug'});
}
-
-reloadConfig();
1;
__END__
From cvs at kolab.org Tue Jul 31 13:54:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 31 Jul 2007 13:54:35 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.141,1.142
Message-ID: <20070731115435.B2A3C60C4CC@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv26549
Modified Files:
release-notes.txt
Log Message:
Removed knowledge of the kolabd package from the Kolab.pm script.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- release-notes.txt 27 Jul 2007 20:28:31 -0000 1.141
+++ release-notes.txt 31 Jul 2007 11:54:33 -0000 1.142
@@ -32,6 +32,9 @@
Replaced statedir path with function argument.
+ Replaced several variables originally rewritten during the
+ make cycle with values in a central configuration file.
+
- kolabd-2.1.99-2007????:
Added "discard" service to the postfix master.cf configuration.
@@ -42,6 +45,9 @@
configuration variable.
Replaced statedir path with function argument in Kolab::LDAP::startup.
+
+ Replaced several variables originally rewritten during the
+ make cycle with values in a central configuration file.
Changes between 2.1.0 and 2.2-beta1:
From cvs at kolab.org Tue Jul 31 13:54:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 31 Jul 2007 13:54:35 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.105, 1.106 kolab.globals.in,
1.1, 1.2 kolab_upgrade.in, 1.3, 1.4 kolabcheckperm.in, 1.2,
1.3 kolabconf.in, 1.2, 1.3 kolabd.in, 1.5,
1.6 kolabquotareport.in, 1.1, 1.2 kolabquotawarn.in, 1.11, 1.12
Message-ID: <20070731115435.BB85B60C4D5@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv26549/kolabd/kolabd
Modified Files:
ChangeLog kolab.globals.in kolab_upgrade.in kolabcheckperm.in
kolabconf.in kolabd.in kolabquotareport.in kolabquotawarn.in
Log Message:
Removed knowledge of the kolabd package from the Kolab.pm script.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- ChangeLog 27 Jul 2007 20:28:31 -0000 1.105
+++ ChangeLog 31 Jul 2007 11:54:33 -0000 1.106
@@ -1,3 +1,20 @@
+2007-07-31 Gunnar Wrobel
+
+ * kolab.globals.in (kolab_locals):
+
+ Instead of rewriting variables within the perl-kolab library these
+ are now provided within kolab.globals.
+
+ * kolabcheckperm.in (Kolab):
+ * kolab_upgrade.in (Kolab):
+ * kolabquotawarn.in (Kolab):
+ * kolabquotareport.in (Kolab):
+ * kolabconf.in (Kolab):
+ * kolabd.in (Kolab):
+
+ Fixed reloadConfig call to contain the path to the global
+ configuration file.
+
2007-07-27 Gunnar Wrobel
* kolabquotareport.in:
@@ -7,7 +24,7 @@
Added statedir variable to the LDAP startup call.
- * Makefile.am (kolabquotareport):
+ * Makefile.am (kolabquotareport):
Made kolabquotareport a rewritten file (kolabquotareport.in)
The file does not get installed though.
Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.globals.in 27 Jul 2007 18:25:20 -0000 1.1
+++ kolab.globals.in 31 Jul 2007 11:54:33 -0000 1.2
@@ -34,3 +34,11 @@
maildefer_listen: 127.0.0.1:10024
maildefer_talk: 127.0.0.1:10025
kolabconf_script: @kolabconf_script@
+kolab_locals: @sysconfdir@/kolab/kolab.conf
+kolab_usr: @kolab_usr@
+kolab_grp: @kolab_grp@
+kolab_rusr: @kolab_rusr@
+kolab_rgrp: @kolab_rgrp@
+kolab_musr: @kolab_musr@
+kolab_mgrp: @kolab_mgrp@
+hashmethod: @sbindir@/slappasswd -s
Index: kolab_upgrade.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_upgrade.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab_upgrade.in 27 Jul 2007 20:28:31 -0000 1.3
+++ kolab_upgrade.in 31 Jul 2007 11:54:33 -0000 1.4
@@ -7,6 +7,9 @@
use Term::ReadKey;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::LDAP;
Index: kolabcheckperm.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabcheckperm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabcheckperm.in 27 Nov 2005 23:57:02 -0000 1.2
+++ kolabcheckperm.in 31 Jul 2007 11:54:33 -0000 1.3
@@ -9,6 +9,9 @@
use strict;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::Conf;
Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabconf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabconf.in 27 Nov 2005 23:57:02 -0000 1.2
+++ kolabconf.in 31 Jul 2007 11:54:33 -0000 1.3
@@ -32,6 +32,9 @@
use Sys::Syslog;
use IO::File;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::Conf;
use Kolab::LDAP;
@@ -89,7 +92,7 @@
Kolab::Conf::rebuildTemplates;
Kolab::log('KC', 'Reloading kolab components');
if( $do_reload ) {
- Kolab::reload;
+ Kolab::Conf::reload;
}
#if ($pid) {
# Kolab::log('KC', "Refreshing the kolab daemon (w/ PID $pid)");
Index: kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabd.in 27 Jul 2007 20:28:31 -0000 1.5
+++ kolabd.in 31 Jul 2007 11:54:33 -0000 1.6
@@ -42,6 +42,9 @@
use Sys::Syslog;
use IO::File;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::LDAP;
use Kolab::LDAP::Backend;
@@ -82,7 +85,7 @@
waitpid($pid, 0);
}
%pids = ();
- Kolab::reloadConfig;
+ Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
Kolab::log('K', 'Synchronising');
Kolab::LDAP::sync;
Kolab::log('K', 'Reloading addressbook.peers');
Index: kolabquotareport.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotareport.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolabquotareport.in 27 Jul 2007 20:28:31 -0000 1.1
+++ kolabquotareport.in 31 Jul 2007 11:54:33 -0000 1.2
@@ -35,6 +35,9 @@
use Mail::Message;
use Cyrus::IMAP::Admin;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::LDAP;
use vars qw($opt_d);
Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolabquotawarn.in 27 Jul 2007 20:28:31 -0000 1.11
+++ kolabquotawarn.in 31 Jul 2007 11:54:33 -0000 1.12
@@ -37,6 +37,9 @@
use Mail::Transport::SMTP;
use Cyrus::IMAP::Admin;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::LDAP;
use File::Basename;
From cvs at kolab.org Wed Aug 1 11:58:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 11:58:40 +0200 (CEST)
Subject: gunnar: server/kolabconf - New directory
Message-ID: <20070801095840.2554A60AE40@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf
In directory doto:/tmp/cvs-serv8236/kolabconf
Log Message:
Directory /kolabrepository/server/kolabconf added to the repository
From cvs at kolab.org Wed Aug 1 11:59:03 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 11:59:03 +0200 (CEST)
Subject: gunnar: server/kolabconf/bin - New directory
Message-ID: <20070801095903.0E08560AE41@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/bin
In directory doto:/tmp/cvs-serv8263/bin
Log Message:
Directory /kolabrepository/server/kolabconf/bin added to the repository
From cvs at kolab.org Wed Aug 1 11:59:03 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 11:59:03 +0200 (CEST)
Subject: gunnar: server/kolabconf/lib - New directory
Message-ID: <20070801095903.11D7260AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/lib
In directory doto:/tmp/cvs-serv8263/lib
Log Message:
Directory /kolabrepository/server/kolabconf/lib added to the repository
From cvs at kolab.org Wed Aug 1 11:59:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 11:59:15 +0200 (CEST)
Subject: gunnar: server/kolabconf/lib/Kolab - New directory
Message-ID: <20070801095915.5B0FF60AE44@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv8288/lib/Kolab
Log Message:
Directory /kolabrepository/server/kolabconf/lib/Kolab added to the repository
From cvs at kolab.org Wed Aug 1 12:38:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 12:38:34 +0200 (CEST)
Subject: gunnar: server/kolabconf/bin kolabconf.in,NONE,1.1
Message-ID: <20070801103834.BA82A60AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/bin
In directory doto:/tmp/cvs-serv10307/bin
Added Files:
kolabconf.in
Log Message:
A draft version for a seperate kolabconf package.
--- NEW FILE: kolabconf.in ---
#!perl
## COPYRIGHT
## ---------
##
## See AUTHORS file
##
##
## LICENSE
## -------
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
##
## $Revision: 1.1 $
use 5.008;
use strict;
use warnings;
our $VERSION = '1.0';
use Getopt::Std;
use Sys::Syslog;
use IO::File;
use Kolab;
Kolab::reloadConfig("@CONFIG_FILE@");
use Kolab::Util;
use Kolab::Conf;
use Kolab::LDAP;
use vars qw($opt_d $opt_n $opt_h);
openlog('kolabconf', 'cons, pid', 'user');
getopts('dnh');
if ($opt_h) {
print <<'EOS';
Usage: kolabconf [-d] [-n] [-h]
Option d (debug) to print out the current config.
Option n (noreload) to skip reloading services after changing configuration.
Option h (help) to get this text.
EOS
exit 0;
}
if ($opt_d) {
foreach my $key (sort keys %Kolab::config) {
my $value;
if( ref($Kolab::config{$key}) eq "ARRAY" ) {
$value = join( ", ", @{$Kolab::config{$key}});
} else {
$value = $Kolab::config{$key};
}
print "$key : " . $value . "\n";
}
exit 0;
}
my $do_reload = 1;
if($opt_n) {
$do_reload = 0;
}
if( !$Kolab::reloadOk ) {
my $msg = "Error loading configuration. Maybe the LDAP server is not running. Please check the system log for errors.";
print STDERR "$msg\n";
Kolab::log('KC', $msg);
exit(-1);
}
Kolab::log('KC', 'Rebuilding templates');
Kolab::Conf::rebuildTemplates;
Kolab::log('KC', 'Reloading kolab components');
if( $do_reload ) {
Kolab::Conf::reload;
}
Kolab::log('KC', 'Finished');
From cvs at kolab.org Wed Aug 1 12:38:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 12:38:34 +0200 (CEST)
Subject: gunnar: server/kolabconf AUTHORS, NONE, 1.1 Changes, NONE, 1.1 INSTALL,
NONE, 1.1 MANIFEST, NONE, 1.1 Makefile.PL, NONE, 1.1 README,
NONE, 1.1 kolabconf.spec, NONE, 1.1
Message-ID: <20070801103834.B667F60AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf
In directory doto:/tmp/cvs-serv10307
Added Files:
AUTHORS Changes INSTALL MANIFEST Makefile.PL README
kolabconf.spec
Log Message:
A draft version for a seperate kolabconf package.
--- NEW FILE: AUTHORS ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: Changes ---
2007-07-31 Gunnar Wrobel
* Kolab-Conf/Conf.pm.in:
Require that the configuration load call is provided with the path
to the global Kolab configuration settings. This way we remove the
knowledge that the kolabd package exist from the Kolab.pm script.
In addition the reload() function was moved to the Conf.pm
module.
2007-01-06 Joergen Fjeld
* Kolab-Conf/Conf.pm.in (build):
Patch applied by Martin Konold:
- fixes order of domains see also https://intevation.de/roundup/kolab/issue1550
2006-12-04 Gunnar Wrobel
* Kolab-Conf/Conf.pm.in (build): Only print "No configuration
variable corresponding to `$1' exists" in case we are NOT skipping
the section.
2006-03-20 Marcus Hüwe
Patch commited by Richard Bos
* Kolab-Conf/Conf.pm.in: introduce a new variable phpinit_dir for the
directory that holds the php.ini file to be used.
2006-01-15 Richard Bos
* Kolab-Conf/Conf.pm.in: use the new variable sasl_authdconffile
instead of @sasl_confdir@/saslauthd.conf
2006-01-07 Richard Bos
* Kolab-Conf/Conf.pm.in: do not crash when the file to be checked
does not exists.
Give a hint _which_ config file can not be moved
2005-12-17 Marcus Hüwe
Patch committed by Richard Bos
* bootstrap: added
* ChangeLog: added
* Kolab/Kolab.pm,
Kolab-Conf/Conf.pm,
Kolab-DirServ/DirServ.pm,
Kolab-LDAP/LDAP.pm,
Kolab-LDAP-Backend-slurpd/slurpd.pm,
Kolab-Mailer/Mailer.pm: are working now with the updated
kolabd/kolabd/dist_conf file
* Kolab/Makefile.am,
Kolab-Mailer/Makefile.am,
Kolab-Conf/Makefile.am,
Kolab-LDAP/Makefile.am,
Kolab-Util/Makefile.am,
Kolab-Cyrus/Makefile.am,
Kolab-LDAP-Backend/Makefile.am,
Kolab-LDAP-Backend-ad/Makefile.am,
Kolab-LDAP-Backend-slurpd/Makefile.am,
Kolab-DirServ/Makefile.am,
Kolab-LDAP-Backend-dirservd/Makefile.am,
Makefile.am: are removed
* Kolab/Makefile.PL,
Kolab-Mailer/Makefile.PL,
Kolab-Conf/Makefile.PL,
Kolab-LDAP/Makefile.PL,
Kolab-Util/Makefile.PL,
Kolab-Cyrus/Makefile.PL,
Kolab-LDAP-Backend/Makefile.PL,
Kolab-LDAP-Backend-ad/Makefile.PL,
Kolab-LDAP-Backend-slurpd/Makefile.PL,
Kolab-DirServ/Makefile.PL,
Kolab-LDAP-Backend-dirservd/Makefile.PL: are removed
--- NEW FILE: INSTALL ---
INSTALLATION
To install this module type the following:
perl Makefile.PL
make
make test
make install
DEPENDENCIES
This package requires the Perl modules from the
perl-kolab
package.
--- NEW FILE: MANIFEST ---
AUTHORS
bin/kolabconf
Changes
INSTALL
lib/Kolab/Conf.pm
README
--- NEW FILE: Makefile.PL ---
use 5.008;
use strict;
use warnings;
use ExtUtils::MakeMaker;
use Getopt::Std;
getopts('ch');
if ($opt_h) {
print <<'EOH';
Usage: perl Makefile.PL [-c CONFIG_FILE] -h
Option c (config file) to specify the path to the kolab.globals
configuration file. The default is
/kolab/etc/kolab/kolab.globals but this may
vary depending on your installation.
Option h (help) to get this text.
EOH
exit 0;
}
if ($opt_c) {
my $CONFIG = $opt_c;
} else {
my $CONFIG = '/kolab/etc/kolab/kolab.globals';
}
sub MY::postamble {
return <<'MAKE_POST';
bin/kolabconf: bin/kolabconf.in
cat $< | sed -e 's#@CONFIG_FILE@#$CONFIG#' > $@
MAKE_POST
}
WriteMakefile(
NAME => 'Kolab::Conf',
VERSION_FROM => 'bin/kolabconf.in',
INSTALLDIRS => 'vendor',
EXE_FILES => [ 'bin/kolabconf', ],
ABSTRACT_FROM => 'lib/Kolab/Conf.pm',
AUTHOR => 'Stuart Bingë and others (see AUTHORS file)'
);
--- NEW FILE: README ---
kolabconf
=========
kolabconf provides the central mechanism to the configuration concept
of the Kolab server. It rewrites the Kolab configuration templates
into the final configuration files and handles the necessary magic
associated to that process.
COPYRIGHT
See the AUTHORS file provided with this package.
LICENCE
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You can view the GNU General Public License, online, at the GNU
Project's homepage; see .
--- NEW FILE: kolabconf.spec ---
## COPYRIGHT
## ---------
##
## See AUTHORS file
##
##
## LICENSE
## -------
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
##
## $Revision: 1.1 $
# versions of individual parts
%define V_perl 5.8.8
%define V_package kolabconf
%define V_version 1.0
%define V_release 20070801
# package information
Name: %{V_package}
Summary: Kolab2 Groupware Server configuration tool
URL: http://www.kolab.org/
Vendor: Kolab Consortium
Packager: p at rdus
Distribution: OpenPKG Community
Class: PLUS
Group: Mail
License: GPL
Version: %{V_version}
Release: %{V_release}
# list of sources
Source0:
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, perl >= %{V_perl}, perl-openpkg >= %{V_perl}-20040126
PreReq: OpenPKG, openpkg >= 20040130, perl >= %{V_perl}
AutoReq: no
AutoReqProv: no
%description
kolabconf provides the central mechanism to the configuration concept
of the Kolab server. It rewrites the Kolab configuration templates
into the final configuration files and handles the necessary magic
associated to that process.
%prep
%setup -q -c
%build
%install
rm -rf $RPM_BUILD_ROOT
%{l_prefix}/bin/perl-openpkg prepare
%{l_prefix}/bin/perl-openpkg -d %{SOURCE0} -A "-c %{l_prefix}/etc/kolab/kolab.globals" configure build install
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`
%files -f files
%clean
rm -rf $RPM_BUILD_ROOT
From cvs at kolab.org Wed Aug 1 12:38:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 12:38:34 +0200 (CEST)
Subject: gunnar: server/kolabconf/lib/Kolab Conf.pm,NONE,1.1
Message-ID: <20070801103834.BE70260AE46@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv10307/lib/Kolab
Added Files:
Conf.pm
Log Message:
A draft version for a seperate kolabconf package.
--- NEW FILE: Conf.pm ---
package Kolab::Conf;
## COPYRIGHT
## ---------
##
## See AUTHORS file
##
##
## LICENSE
## -------
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
## published by the Free Software Foundation; either version 2, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You can view the GNU General Public License, online, at the GNU
## Project's homepage; see .
##
## $Revision: 1.1 $
use 5.008;
use strict;
use warnings;
use IO::File;
use File::Copy;
use File::Temp;
use File::stat;
use Kolab;
use Kolab::Util;
use Kolab::LDAP;
require Exporter;
our @ISA = qw(Exporter);
our %EXPORT_TAGS = (
'all' => [ qw(
&buildPostfixTransportMap
&buildCyrusConfig
&buildCyrusGroups
&buildLDAPReplicas
&rebuildTemplates
&checkPermissions
) ]
);
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw(
);
our $VERSION = sprintf "%d.%03d", q$Revision: 1.1 $ =~ /(\d+)/g;
my $templatedir = $Kolab::config{"templatedir"};
my %special_templates = (
"$templatedir/transport.template" => 1,
"$templatedir/virtual.template" => 1,
"$templatedir/imapd.group.template" => 1,
"$templatedir/cyrus.conf.template" => 1,
"$templatedir/slapd.access.template" => 1,
"$templatedir/slapd.replicas.template" => 1);
my %templates = ();
my %ownership = ();
my %permissions = ();
my %templatehaschanged = ();
my %haschanged = ();
sub fixup {
my $file = shift;
my $ownership = shift;
my $perm = shift;
(my $owner, my $group) = split(/:/, $ownership, 2);
my $uid = (getpwnam($owner))[2];
my $gid = (getgrnam($group))[2];
Kolab::log('T', sprintf("Changing permissions of %s to 0%o", $file, $perm ), KOLAB_DEBUG );
if( chmod($perm, $file) != 1 ) {
Kolab::log('T', "Unable to change permissions of `$file' to ".sprintf("0%o",$perm), KOLAB_ERROR);
exit(1);
}
Kolab::log('T', "Changing owner of $file to $owner:$group ($uid:$gid)", KOLAB_DEBUG );
if( chown($uid,$gid,$file) != 1 ) {
Kolab::log('T', "Unable to change ownership of `$file' to $uid:$gid", KOLAB_ERROR);
exit(1);
}
}
sub build {
my $tmpl = shift;
my $cfg = shift;
my $owner = shift;
my $perm = shift;
my $oldcfg = $cfg . '.old';
my $oldmask = umask 077;
copy($cfg, $oldcfg);
#chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
# To avoid warnings, the backup files must be owned by root
chown(0, 0, $oldcfg);
umask $oldmask;
#chmod(0600, $oldcfg) if ($oldcfg =~ /openldap/);
Kolab::log('T', "Creating new configuration file `$cfg' from template `$tmpl'", KOLAB_DEBUG );
#print STDERR "Creating new configuration file `$cfg' from template `$tmpl'\n";
my $template;
if (!($template = IO::File->new($tmpl, 'r'))) {
Kolab::log('T', "Unable to open template file `$tmpl'", KOLAB_ERROR);
# Error, fail gracefully
return;
}
my $config;
if (!($config = new File::Temp( TEMPLATE => 'tmpXXXXX',
DIR => $Kolab::config{"kolabdir"},
SUFFIX => '.kolabtmp',
UNLINK => 0 ))) {
Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
exit(1);
}
#Kolab::log('T', "Using temporary file '".$config->filename."'", KOLAB_DEBUG );
my $skip = 0;
my $keep = 0;
while (<$template>) {
#Eat the meta data sections
if (/^KOLAB_META_START$/) {
my $found_end;
while (!$found_end) {
$_ = <$template>;
$found_end = /^KOLAB_META_END$/;
}
$_ = <$template>;
}
if (/\@{3}if (\S+?)\@{3}/) {
if ($Kolab::config{$1} && lc($Kolab::config{$1}) ne "false" ) {
# Keep text
$keep = 1;
} else {
# Skip text
$skip++;
$keep = 0;
}
s/\@{3}if (\S+?)\@{3}\n?//;
} elsif (/\@{3}else\@{3}/) {
if( $keep == 0 ) {
# Now keep
$keep = 1;
$skip--;
} else {
# Now skip
$keep = 0;
$skip++;
}
s/\@{3}else\@{3}\n?//;
} elsif (/\@{3}endif\@{3}/) {
($skip > 0) && $skip--;
s/\@{3}endif\@{3}\n?//;
} else {
while (/\@{3}([^\s\@]+?)(\|(.+?)\((.*)\))?\@{3}/) {
my $attr = $1;
my $fct = $3;
my $args = $4;
#print STDERR "attr=\"$attr\", fct=\"$fct\", args=\"$args\"\n";
if ($Kolab::config{$attr}) {
my $val = "";
if( !$fct ) {
if (ref $Kolab::config{$attr} eq "ARRAY") {
$val = $Kolab::config{$attr}->[0];
} else {
$val = $Kolab::config{$attr};
}
} else {
# Modifier functions
SWITCH: {
# Join function
$fct eq 'join' && do {
if (ref $Kolab::config{$attr} eq "ARRAY") {
my @vals = @{$Kolab::config{$attr}} ;
# We want to make sure subdomain.domain.tld comes before domain.tld
my @length_sorted_vals = sort {length $a cmp length $b} @vals;
$val = join ($args, @length_sorted_vals) ;
} else {
$val = $Kolab::config{$attr};
}
last SWITCH;
};
# Quote function
$fct eq 'quote' && do {
# slapd.conf compatible quoting
$val = $Kolab::config{$attr};
$val =~ s/"/\"/g;
$val = '"'.$val.'"';
last SWITCH;
}
}
}
s/\@{3}([^\s\@]+?)(\|.+?)?\@{3}/$val/;
last if ( $val eq "\@\@\@$attr\@\@\@" ); # prevent endless loop
} else {
# Only warn the user in case we are not skipping the section
($skip == 0) && Kolab::log('T', "No configuration variable corresponding to `$1' exists", KOLAB_WARN);
s/\@{3}([^\s\@]+?)\@{3}//;
}
}
($skip == 0) && print $config $_;
}
}
$template->close;
$config->close;
move($config->filename, $cfg) || Kolab::log('T', "Error moving configfile to $cfg, error: $!", KOLAB_ERROR );
fixup( $cfg, $owner, $perm );
#chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $cfg);
#chmod(0600, $cfg) if ($cfg =~ /openldap/);
if (-f $oldcfg && !defined $special_templates{$tmpl} ) {
my $rc = `diff -q $cfg $oldcfg`;
chomp($rc);
if ($rc) {
if ($cfg =~ /postfix/) {
$haschanged{'postfix'} = 1;
} elsif ($cfg =~ /saslauthd/) {
$haschanged{'saslauthd'} = 1;
} elsif ($cfg =~ /apache2/) {
$haschanged{'apache2'} = 1;
} elsif ($cfg =~ /proftpd/) {
$haschanged{'proftpd'} = 1;
} elsif ($cfg =~ /openldap/) {
$haschanged{'slapd'} = 1;
} elsif ($cfg =~ /imapd/) {
$haschanged{'imapd'} = 1;
} elsif ($cfg =~ /amavisd/) {
$haschanged{'amavisd'} = 1;
} elsif ($cfg =~ /clamav/) {
$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 );
}
}
Kolab::log('T', "Finished creating configuration file `$cfg'", KOLAB_DEBUG );
}
sub buildPostfixTransportMap
{
buildPostfixMap( 'transport' );
}
sub buildPostfixVirtualMap
{
buildPostfixMap( 'virtual' );
}
sub buildPostfixMap
{
my $map = shift;
Kolab::log('T', "Building Postfix $map map", KOLAB_DEBUG);
my $keytemplate = "$templatedir/$map.template";
my $cfg = $templates{$keytemplate};
my $oldcfg = $cfg . '.old';
#my $oldmask = umask 077;
#copy($cfg, $oldcfg);
#chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
#umask $oldmask;
#delete $templates{$keytemplate};
my $transport;
if (!($transport = IO::File->new($cfg, 'a'))) {
Kolab::log('T', "Unable to create Postfix $map map", KOLAB_ERROR);
exit(1);
}
my $ldap = Kolab::LDAP::create(
$Kolab::config{'ldap_ip'},
$Kolab::config{'ldap_port'},
$Kolab::config{'bind_dn'},
$Kolab::config{'bind_pw'}
);
my $mesg = $ldap->search(
base => 'k=kolab,'.$Kolab::config{'base_dn'},
scope => 'base',
filter => '(objectclass=*)'
);
if ($mesg->code) {
Kolab::log('T', "Unable to locate Postfix $map map entries in LDAP", KOLAB_ERROR);
exit(1);
}
my $ldapobject;
if ($mesg->code <= 0) {
foreach $ldapobject ($mesg->entries) {
my $routes = $ldapobject->get_value("postfix-$map", asref => 1);
foreach (@$routes) {
$_ = trim($_);
Kolab::log('T', "Adding entry `$_' to $map");
print $transport $_ . "\n";
}
}
} else {
Kolab::log('T', "No Postfix $map map entries found");
}
Kolab::LDAP::destroy($ldap);
$transport->close;
# FIXME: bad way of doing things...
#system("chown root:root @emailserver_confdir@/*");
fixup( $cfg, $ownership{$cfg}, $permissions{$cfg});
system("$Kolab::config{'postmapping'}/$map");
if (-f $oldcfg) {
my $rc = `diff -q $cfg $oldcfg`;
chomp($rc);
if ($rc) {
Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
$haschanged{'postfix'} = 1;
}
} else {
$haschanged{'postfix'} = 1;
}
Kolab::log('T', 'Finished building Postfix $map map', KOLAB_DEBUG);
}
sub buildCyrusConfig
{
Kolab::log('T', 'Building Cyrus config', KOLAB_DEBUG);
my $keytemplate = "$templatedir/cyrus.conf.template";
my $cfg = $templates{$keytemplate};
my $imapdtemplate = "$templatedir/imapd.conf.template";
my $imapdcfg = $templates{$imapdtemplate};
my $oldcfg = $cfg . '.old';
#delete $templates{$keytemplate};
#my $oldmask = umask 077;
#copy($cfg, $oldcfg);
#chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
#umask $oldmask;
my $cyrusconf;
my $cyrustemplate;
if (!($cyrustemplate = IO::File->new($keytemplate, 'r'))) {
Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
exit(1);
}
if (!($cyrusconf = IO::File->new($cfg, 'w'))) {
Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
exit(1);
}
while (<$cyrustemplate>) {
if (/^KOLAB_META_START$/) {
my $found_end;
while (!$found_end) {
$_ = <$cyrustemplate>;
$found_end = /^KOLAB_META_END$/;
}
$_ = <$cyrustemplate>;
}
if (/\@{3}cyrus-imap\@{3}/ && ($Kolab::config{"cyrus-imap"} =~ /true/i)) {
$_ = "imap cmd=\"imapd -C $imapdcfg\" listen=\"143\" prefork=0\n";
}
elsif (/\@{3}cyrus-imap\@{3}/ && ($Kolab::config{"cyrus-imap"} =~ /false/i)) {
# Even if imapd is disabled, enable it for localhost -- resource handlers depend on it
$_ = "imap cmd=\"imapd -C $imapdcfg\" listen=\"127.0.0.1:143\" prefork=0\n";
}
elsif (/\@{3}cyrus-pop3\@{3}/ && ($Kolab::config{"cyrus-pop3"} =~ /true/i)) {
$_ = "pop3 cmd=\"pop3d -C $imapdcfg\" listen=\"110\" prefork=0\n";
}
elsif (/\@{3}cyrus-imaps\@{3}/ && ($Kolab::config{"cyrus-imaps"} =~ /true/i)) {
$_ = "imaps cmd=\"imapd -s -C $imapdcfg\" listen=\"993\" prefork=0\n";
}
elsif (/\@{3}cyrus-pop3s\@{3}/ && ($Kolab::config{"cyrus-pop3s"} =~ /true/i)) {
$_ = "pop3s cmd=\"pop3d -s -C $imapdcfg\" listen=\"995\" prefork=0\n";
}
elsif (/\@{3}cyrus-sieve\@{3}/ && ($Kolab::config{"cyrus-sieve"} =~ /true/i)) {
$_ = "sieve cmd=\"timsieved -C $imapdcfg\" listen=\"2000\" prefork=0\n";
}
$_ =~ s/\@{3}.*\@{3}//;
print $cyrusconf $_;
}
$cyrustemplate->close;
$cyrusconf->close;
fixup( $cfg, $ownership{$cfg}, $permissions{$cfg});
if (-f $oldcfg) {
my $rc = `diff -q $cfg $oldcfg`;
chomp($rc);
if ($rc) {
Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
$haschanged{'imapd'} = 1;
}
} else {
$haschanged{'imapd'} = 1;
}
Kolab::log('T', 'Finished building Cyrus config', KOLAB_DEBUG);
}
sub buildCyrusGroups
{
Kolab::log('T', 'Building Cyrus groups', KOLAB_DEBUG);
my $keytemplate = "$templatedir/imapd.group.template";
my $cfg = $templates{$keytemplate};
my $oldcfg = $cfg . '.old';
#delete $templates{$keytemplate};
#my $oldmask = umask 077;
#copy($cfg, $oldcfg);
#chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
#umask $oldmask;
my $groupconf;
if (!($groupconf = IO::File->new($cfg, 'a'))) {
Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
exit(1);
}
my $ldap = Kolab::LDAP::create(
$Kolab::config{'ldap_ip'},
$Kolab::config{'ldap_port'},
$Kolab::config{'bind_dn'},
$Kolab::config{'bind_pw'}
);
my $mesg = $ldap->search(
base => $Kolab::config{'base_dn'},
scope => 'sub',
filter => '(&(mail=*)(objectclass=kolabgroupofnames))'
);
if ($mesg->code) {
Kolab::log('T', 'Unable to locate Cyrus groups in LDAP', KOLAB_ERROR);
exit(1);
}
my $ldapobject;
my $count = 60000;
if ($mesg->code <= 0) {
foreach $ldapobject ($mesg->entries) {
#my $group = $ldapobject->get_value('cn') . '@'.join('.',reverse(@dn)) . ":*:$count:";
my $group = lc($ldapobject->get_value('mail')).":*:$count:";
my $userlist = $ldapobject->get_value('member', asref => 1);
foreach (@$userlist) {
my $uid = $_;
my $umesg = $ldap->search( base => $uid,
scope => 'base',
filter => '(objectClass=*)' );
if ( $umesg && $umesg->code() <= 0 && $umesg->count() == 1 ) {
my $mail;
($mail = $umesg->entry(0)->get_value('mail')) or
($mail = $umesg->entry(0)->get_value('uid'));
$group .= lc($mail).',';
}
}
$group =~ s/,$//;
print $groupconf $group . "\n";
Kolab::log('T', "Adding cyrus group `$group'");
$count++;
}
} else {
Kolab::log('T', 'No Cyrus groups found');
}
$groupconf->close;
Kolab::LDAP::destroy($ldap);
fixup( $cfg, $ownership{$cfg}, $permissions{$cfg});
Kolab::log('T', 'Finished building Cyrus groups', KOLAB_DEBUG );
}
sub buildLDAPAccess
{
Kolab::log('T', 'Building LDAP access file', KOLAB_DEBUG);
my $keytemplate = "$templatedir/slapd.access.template";
my $cfg = $templates{$keytemplate};
my $oldcfg = $cfg . '.old';
my $access;
if (!($access = IO::File->new($cfg, 'a'))) {
Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
exit(1);
}
my $global_acl = <<'EOS';
# Domain specific access
access to filter=(&(objectClass=kolabInetOrgPerson)(mail=*@@@@domain@@@)(|(!(alias=*))(alias=*@@@@domain@@@)))
by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write
by * break
access to filter=(&(objectClass=kolabGroupOfNames)(mail=*@@@@domain@@@))
by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write
by * break
access to filter=(&(objectClass=kolabSharedFolder)(cn=*@@@@domain@@@))
by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write
by * break
EOS
my $dom_acl1 = << 'EOS';
# Access to domain groups
access to dn.children="cn=domains,cn=internal,@@@base_dn@@@"
by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
by dn="cn=nobody,cn=internal,@@@base_dn@@@" read
EOS
my $dom_acl2 = << 'EOS';
by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" read
EOS
my $dom_acl3 = << 'EOS';
by * search stop
EOS
my $str;
my $domain;
my @domains;
if( ref($Kolab::config{'postfix-mydestination'}) eq 'ARRAY' ) {
@domains = @{$Kolab::config{'postfix-mydestination'}};
} else {
@domains =( $Kolab::config{'postfix-mydestination'} );
}
($str = $dom_acl1) =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;
print $access $str;
foreach $domain (@domains) {
($str = $dom_acl2) =~ s/\@{3}domain\@{3}/$domain/g;
$str =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;
print $access $str;
}
($str = $dom_acl3) =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;
print $access $str;
foreach $domain (@domains) {
($str = $global_acl) =~ s/\@{3}domain\@{3}/$domain/g;
$str =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g;
print $access $str;
Kolab::log('T', "Adding acl for domain '$str'");
}
$access->close;
if (-f $oldcfg) {
my $rc = `diff -q $cfg $oldcfg`;
chomp($rc);
if ($rc) {
Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
$haschanged{'slapd'} = 1;
}
} else {
$haschanged{'slapd'} = 1;
}
fixup( $cfg, $ownership{$cfg}, $permissions{$cfg});
Kolab::log('T', 'Finished building LDAP access file', KOLAB_DEBUG );
}
sub buildLDAPReplicas
{
Kolab::log('T', 'Building LDAP replicas', KOLAB_DEBUG);
my $keytemplate = "$templatedir/slapd.replicas.template";
my $cfg = $templates{$keytemplate};
my $oldcfg = $cfg . '.old';
my $repl;
if (!($repl = IO::File->new($cfg, 'a'))) {
Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
exit(1);
}
if( $Kolab::config{'is_master'} eq "true" ) {
# Master setup
my @kh;
if( ref $Kolab::config{'kolabhost'} eq 'ARRAY' ) {
@kh = @{$Kolab::config{'kolabhost'}};
} else {
@kh = ( $Kolab::config{'kolabhost'} );
}
for my $h ( @kh ) {
next if lc($h) eq lc($Kolab::config{'fqdnhostname'});
print $repl "replica uri=ldaps://$h\n"
." binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
." bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";
}
} else {
# Slave setup
# Output an update dn statement instead
print $repl "updatedn ".$Kolab::config{'bind_dn'}."\n";
print $repl "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
}
$repl->close;
fixup( $cfg, $ownership{$cfg}, $permissions{$cfg});
if (-f $oldcfg) {
my $rc = `diff -q $cfg $oldcfg`;
chomp($rc);
if ($rc) {
Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
$haschanged{'slapd'} = 1;
}
} else {
$haschanged{'slapd'} = 1;
}
Kolab::log('T', 'Finished building LDAP replicas', KOLAB_DEBUG);
}
sub loadMetaTemplates
{
my $templatedir = shift;
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 );
my @metatemplates = grep { /\.template$/ } readdir (DIR);
closedir(DIR);
foreach my $template (@metatemplates) {
my $runonchange = undef;
#Open each file and check for the META
if (open (TEMPLATE, "$templatedir/$template" )) {
my $line = ;
if ($line =~ /^KOLAB_META_START$/) {
Kolab::log('T', 'Processing META template :'.$template, KOLAB_DEBUG );
my ($found_end, $target, $permissions, $ownership);
while () {
$line = $_;
if (!$found_end) {
$found_end = $line =~ /^KOLAB_META_END$/;
if (!$found_end && $line) {
my ($key,$value) = split(/=/,$line);
chomp($value);
Kolab::log('T', 'META Key: '.$key.' Value: '.$value, KOLAB_DEBUG );
if ($key =~ /^TARGET$/) {
$target = $value;
Kolab::log('T', 'META Target '.$target, KOLAB_DEBUG );
}
if ($key =~ /^PERMISSIONS$/) {
$permissions = $value;
Kolab::log('T', 'META Permissions '.$permissions, KOLAB_DEBUG );
}
if ($key =~ /^OWNERSHIP$/) {
$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 );
}
}
}
}
if ($found_end && $target && $permissions && $ownership) {
Kolab::log('T', 'All mandatory fields populated in '.$template, KOLAB_DEBUG );
$$tref{$templatedir . "/" . $template} = $target;
$$oref{$target} = $ownership;
$permissions = oct($permissions);
$$pref{$target} = $permissions;
my $runcmdtemplate = $templatedir."/".$template;
$$cmdref{$runcmdtemplate} = $runonchange if (defined $runonchange);
}
}
} else {
Kolab::log('T', 'Could not open template file: '. $template, KOLAB_WARN);
}
}
}
sub rebuildTemplates
{
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, \%runonchange );
foreach $key (keys %templates) {
my $tpl = $templates{$key};
#print STDOUT "Rebuilding $key => $templates{$key}\n";
build($key, $tpl, $ownership{$tpl}, $permissions{$tpl} );
}
buildPostfixTransportMap;
buildPostfixVirtualMap;
buildLDAPAccess;
buildLDAPReplicas;
buildCyrusConfig;
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 {
my $key;
my $value;
Kolab::log('T', 'Checking generated config file permissions and ownership', KOLAB_DEBUG );
loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership );
my $ok = 1;
foreach $key (keys %templates) {
my $tpl = $templates{$key};
if (-r $tpl) {
my $st = stat($tpl);
my $owner = getpwuid($st->uid).':'.getgrgid($st->gid);
if( ( ($st->mode & 07777) != $permissions{$tpl}) ||
($owner ne $ownership{$tpl}) ) {
my $str = 'File '.$tpl.' has the wrong persmissions/owner. Found '
.sprintf("%lo", $st->mode&07777).' '.$owner.', expected '
.sprintf("%lo",$permissions{$tpl}).' '.$ownership{$tpl};
print( "$str\n" );
Kolab::log('T', $str, KOLAB_ERROR );
$ok = 0;
}
} else {
my $str = "File $tpl does not exist";
print "$str\n";
Kolab::log('T', "$str", KOLAB_ERROR );
}
}
return $ok;
}
sub reload
{
if ($haschanged{'slapd'}) {
&log('K', 'Restarting OpenLDAP...');
system("$Kolab::config{'KOLABRC'} rc openldap restart &");
}
if ($haschanged{'saslauthd'}) {
&log('K', 'Restarting SASLAuthd...');
system("$Kolab::config{'KOLABRC'} rc sasl stop; sleep 1; $Kolab::config{sbindir}/saslauthd -a ldap -n 5");
}
if ($haschanged{'apache'}) {
&log('K', 'Reloading Apache...');
system("$Kolab::config{sbindir}/apachectl graceful");
}
if ($haschanged{'postfix'}) {
&log('K', 'Reloading Postfix...');
system("$Kolab::config{sbindir}/postfix reload");
}
if ($haschanged{'imapd'}) {
&log('K', 'Restarting imapd...');
# Would it be enough with a reload here? /steffen
system("$Kolab::config{'KOLABRC'} rc imapd restart");
}
if ($haschanged{'amavisd'}) {
&log('K', 'Restarting amavisd...');
system("$Kolab::config{'KOLABRC'} rc amavisd restart");
}
if ($haschanged{'clamav'}) {
&log('K', 'Restarting clamav...');
system("$Kolab::config{'KOLABRC'} rc clamav restart");
}
if ($Kolab::config{'proftpd-ftp'} =~ /true/i) {
Kolab::log('K', 'Starting ProFTPd if not running');
system("$Kolab::config{'KOLABRC'} rc proftpd start");
if ($haschanged{'proftpd'}) {
&log('K', 'Reloading ProFTPd...');
kill('SIGHUP', `cat $Kolab::config{ftpserver_pidfile}`);
}
} else {
&log('K', 'Stopping ProFTPd, if running...');
system("$Kolab::config{'KOLABRC'} rc proftpd stop");
}
%Kolab::Conf::haschanged = ();
&log('K', 'Reload finished');
}
1;
__END__
# Below is stub documentation for your module. You'd better edit it!
=head1 NAME
Kolab::Conf - Perl extension for Kolab template generation
=head1 ABSTRACT
Kolab::Conf handles the generation of template files, used by
kolabconf.
=head1 AUTHOR
Stuart Bingë s.binge at codefusion.co.zaE
=head1 COPYRIGHT AND LICENSE
Copyright (c) 2003 Code Fusion cc
Portions based on work by the following people:
(c) 2003 Tassilo Erlewein
(c) 2003,2004,255,2006,2007 Martin Konold
(c) 2003 Achim Frank
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You can view the GNU General Public License, online, at the GNU
Project's homepage; see .
=cut
From cvs at kolab.org Wed Aug 1 14:34:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 14:34:33 +0200 (CEST)
Subject: gunnar: server/kolabconf/bin .cvsignore,NONE,1.1
Message-ID: <20070801123433.5A1FD600172@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/bin
In directory doto:/tmp/cvs-serv15108/bin
Added Files:
.cvsignore
Log Message:
Fixed the new kolabconf package definition.
--- NEW FILE: .cvsignore ---
kolabconf
From cvs at kolab.org Wed Aug 1 14:34:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 14:34:33 +0200 (CEST)
Subject: gunnar: server/kolabconf/lib/Kolab Conf.pm,1.1,1.2
Message-ID: <20070801123433.58A50600170@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv15108/lib/Kolab
Modified Files:
Conf.pm
Log Message:
Fixed the new kolabconf package definition.
Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Conf.pm 1 Aug 2007 10:38:32 -0000 1.1
+++ Conf.pm 1 Aug 2007 12:34:31 -0000 1.2
@@ -843,19 +843,11 @@
Kolab::Conf handles the generation of template files, used by
kolabconf.
-=head1 AUTHOR
-
-Stuart Bingë s.binge at codefusion.co.zaE
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (c) 2003 Code Fusion cc
+=head1 COPYRIGHT AND AUTHORS
-Portions based on work by the following people:
+Stuart Bingë and others (see AUTHORS file)
- (c) 2003 Tassilo Erlewein
- (c) 2003,2004,255,2006,2007 Martin Konold
- (c) 2003 Achim Frank
+=head1 LICENSE
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
From cvs at kolab.org Wed Aug 1 14:34:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 14:34:33 +0200 (CEST)
Subject: gunnar: server/kolabconf .cvsignore, NONE, 1.1 MANIFEST, 1.1,
1.2 Makefile.PL, 1.1, 1.2 kolabconf.spec, 1.1, 1.2
Message-ID: <20070801123433.5BB3E600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf
In directory doto:/tmp/cvs-serv15108
Modified Files:
MANIFEST Makefile.PL kolabconf.spec
Added Files:
.cvsignore
Log Message:
Fixed the new kolabconf package definition.
--- NEW FILE: .cvsignore ---
*.tar.gz
Makefile
blib
pm_to_blib
*.src.rpm
Index: MANIFEST
===================================================================
RCS file: /kolabrepository/server/kolabconf/MANIFEST,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MANIFEST 1 Aug 2007 10:38:32 -0000 1.1
+++ MANIFEST 1 Aug 2007 12:34:31 -0000 1.2
@@ -1,6 +1,8 @@
AUTHORS
-bin/kolabconf
+bin/kolabconf.in
Changes
INSTALL
lib/Kolab/Conf.pm
+Makefile.PL
+MANIFEST
README
Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.PL 1 Aug 2007 10:38:32 -0000 1.1
+++ Makefile.PL 1 Aug 2007 12:34:31 -0000 1.2
@@ -3,44 +3,126 @@
use warnings;
use ExtUtils::MakeMaker;
-use Getopt::Std;
+use Getopt::Long;
-getopts('ch');
+my $HELP = 0;
+my $CONFIG = '/kolab/etc/kolab/kolab.globals';
+my $INSTALLSCRIPT = '/kolab/sbin';
-if ($opt_h) {
+GetOptions(
+ "config=s" => \$CONFIG,
+ "bin=s" => \$INSTALLSCRIPT,
+ "help" => \$HELP
+ );
+
+if ($HELP) {
print <<'EOH';
-Usage: perl Makefile.PL [-c CONFIG_FILE] -h
+Usage: perl Makefile.PL [--config CONFIG_FILE] [--bin BIN_DIR] --help
-Option c (config file) to specify the path to the kolab.globals
- configuration file. The default is
- /kolab/etc/kolab/kolab.globals but this may
- vary depending on your installation.
+Option config
-Option h (help) to get this text.
+ to specify the path to the kolab.globals configuration file. The
+ default is /kolab/etc/kolab/kolab.globals but this may vary
+ depending on your installation.
+
+Option bin
+
+ to specify the path to the directory where the kolabconf script
+ should be installed.
+
+Option help
+
+ to get this text.
EOH
exit 0;
}
-if ($opt_c) {
- my $CONFIG = $opt_c;
-} else {
- my $CONFIG = '/kolab/etc/kolab/kolab.globals';
+# Add the dist_openpkg target to the dist target
+sub MY::dist {
+ package MY; # To help SUPER work right
+ my $self = shift;
+ my @m;
+
+ push(@m, $self->SUPER::dist(@_));
+
+ my $dist = join "", @m;
+
+ $dist =~ s/(dist.*)/$1 dist_openpkg/;
+
+ return $dist;
+}
+
+# Remove additional files
+sub MY::veryclean {
+ package MY; # To help SUPER work right
+ my $self = shift;
+ my @m;
+
+ push(@m, $self->SUPER::clean(@_));
+
+ my $clean = join "", @m;
+
+ $clean =~ s/(clean.*)/$1 clean_openpkg clean_scripts/;
+
+ return $clean;
}
sub MY::postamble {
- return <<'MAKE_POST';
+
+ my $add = ".PHONY: bin/kolabconf
bin/kolabconf: bin/kolabconf.in
- cat $< | sed -e 's#@CONFIG_FILE@#$CONFIG#' > $@
+ cat \$< | sed -e 's#\@CONFIG_FILE@#$CONFIG#' > \$@
-MAKE_POST
+ifeq \"x\$(RPM)\" \"x\"
+ RPM = \$(HOME)/bin/openpkg rpm
+endif
+ifeq \"x\$(KOLABRPMSRC)\" \"x\"
+ KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq \"x\$(KOLABRPMPKG)\" \"x\"
+ KOLABRPMPKG = /kolab/RPM/PKG
+endif
+ifeq \"x\$(KOLABRPMTMP)\" \"x\"
+ KOLABRPMTMP = /kolab/RPM/TMP
+endif
+
+PACKAGE = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_package' kolabconf.spec | sed -e 's/.*V_package\\s*\\([a-z\\-\\_]*\\).*/\\1/')
+VERSION = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_version' kolabconf.spec | sed -e 's/.*V_version\\s*\\([0-9.]*\\).*/\\1/')
+RELEASE = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_release' kolabconf.spec | sed -e 's/.*V_release\\s*\\([0-9]*\\).*/\\1/')
+
+clean_all: veryclean
+ rm -rf bin/kolabconf
+ rm -rf \$(KOLABRPMTMP)/\$(PACKAGE)
+ rm -rf \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm
+ rm -rf *.tar.gz
+ rm -rf *~
+
+dist_openpkg: kolabconf.spec \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm
+ cp \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm ../stage/
+
+\$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm: \$(PACKAGE).spec
+ test -d \$(KOLABRPMSRC)/\$(PACKAGE) || mkdir \$(KOLABRPMSRC)/\$(PACKAGE)
+ cp \$(PACKAGE).spec \$(KOLABRPMSRC)/\$(PACKAGE)
+ cp \$(PACKAGE)-\$(VERSION).tar.gz \$(KOLABRPMSRC)/\$(PACKAGE)
+ cd \$(KOLABRPMSRC)/\$(PACKAGE) && \$(RPM) -ba \$(PACKAGE).spec
+ cp -p \$(KOLABRPMPKG)/\$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm .
+
+";
+
+ return $add;
}
WriteMakefile(
- NAME => 'Kolab::Conf',
+ NAME => 'kolabconf',
VERSION_FROM => 'bin/kolabconf.in',
INSTALLDIRS => 'vendor',
EXE_FILES => [ 'bin/kolabconf', ],
- ABSTRACT_FROM => 'lib/Kolab/Conf.pm',
+ INSTALLSCRIPT => $INSTALLSCRIPT,
+ ABSTRACT =>
+'kolabconf provides the central mechanism to the configuration concept
+of the Kolab server. It rewrites the Kolab configuration templates
+into the final configuration files and handles the necessary magic
+associated to that process.',
AUTHOR => 'Stuart Bingë and others (see AUTHORS file)'
);
Index: kolabconf.spec
===================================================================
RCS file: /kolabrepository/server/kolabconf/kolabconf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolabconf.spec 1 Aug 2007 10:38:32 -0000 1.1
+++ kolabconf.spec 1 Aug 2007 12:34:31 -0000 1.2
@@ -43,7 +43,7 @@
Release: %{V_release}
# list of sources
-Source0:
+Source0: %{V_package}-%{V_version}.tar.gz
# build information
Prefix: %{l_prefix}
@@ -67,7 +67,7 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_prefix}/bin/perl-openpkg prepare
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE0} -A "-c %{l_prefix}/etc/kolab/kolab.globals" configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE0} -v -A "--config \"%{l_prefix}/etc/kolab/kolab.globals\" --bin \"%{l_prefix}/sbin\"" configure build install
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`
From cvs at kolab.org Wed Aug 1 16:31:37 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:31:37 +0200 (CEST)
Subject: gunnar: server/kolabconf DEVELOPMENT, NONE, 1.1 AUTHORS, 1.1,
1.2 Changes, 1.1, 1.2 Makefile.PL, 1.2, 1.3 kolabconf.spec, 1.2, 1.3
Message-ID: <20070801143137.5D6D260AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf
In directory doto:/tmp/cvs-serv18868
Modified Files:
AUTHORS Changes Makefile.PL kolabconf.spec
Added Files:
DEVELOPMENT
Log Message:
Some minor fixes to the new package and some more comments.
--- NEW FILE: DEVELOPMENT ---
Development notes
=================
The kolabconf package is a standard perl package meant to be handled
with the Makefile.PL script.
The Kolab Server packages were usually not released as source
packages. This should be changed with this new package layout. The
"dist" target will produce a kolabconf-*.tar.gz package that can be
distributed as source package. The same run will produce a
kolabconf-*.src.rpm package that is suited for installation on an
OpenPKG system.
Version numbering
=================
kolabconf is a Kolab Server core package. It should have the same
version as the Server release. As a part of Kolab Server 2.1 the
version number should be 2.1.
Once development picks up after a release, the version number should
be switched to $(OLD_VERSION).99 e.g. 2.1.99. There'll be no changes
of the version during development as there are no source packages
being released.
For the next release the version number will be increased to the new
Kolab Server version e.g. 2.2 and a new source packge will be
provided.
For testing purposes the "dist" target will produce source RPM
packages that have the current date attached as release number. This
allows you to continuously upgrade your test installation.
Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/kolabconf/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AUTHORS 1 Aug 2007 10:38:32 -0000 1.1
+++ AUTHORS 1 Aug 2007 14:31:35 -0000 1.2
@@ -1,7 +1,7 @@
Originally written by Stuart Bingë
- Copyright (c) 2003 Stuart Bingë
- Copyright (c) 2003 Code Fusion cc
+ Copyright (c) 2003 - 2004 Stuart Bingë
+ Copyright (c) 2003 - 2004 Code Fusion cc
Portions based on work by the following people:
Index: Changes
===================================================================
RCS file: /kolabrepository/server/kolabconf/Changes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Changes 1 Aug 2007 10:38:32 -0000 1.1
+++ Changes 1 Aug 2007 14:31:35 -0000 1.2
@@ -1,3 +1,9 @@
+2007-08-01 Gunnar Wrobel
+
+ Created the kolabconf package by moving kolabconf and the
+ Conf.pm perl module into one package. The package is now a
+ clean perl package.
+
2007-07-31 Gunnar Wrobel
* Kolab-Conf/Conf.pm.in:
Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.PL 1 Aug 2007 12:34:31 -0000 1.2
+++ Makefile.PL 1 Aug 2007 14:31:35 -0000 1.3
@@ -89,7 +89,7 @@
PACKAGE = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_package' kolabconf.spec | sed -e 's/.*V_package\\s*\\([a-z\\-\\_]*\\).*/\\1/')
VERSION = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_version' kolabconf.spec | sed -e 's/.*V_version\\s*\\([0-9.]*\\).*/\\1/')
-RELEASE = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_release' kolabconf.spec | sed -e 's/.*V_release\\s*\\([0-9]*\\).*/\\1/')
+RELEASE = \$(shell date '+%Y%m%d')
clean_all: veryclean
rm -rf bin/kolabconf
Index: kolabconf.spec
===================================================================
RCS file: /kolabrepository/server/kolabconf/kolabconf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabconf.spec 1 Aug 2007 12:34:31 -0000 1.2
+++ kolabconf.spec 1 Aug 2007 14:31:35 -0000 1.3
@@ -26,8 +26,8 @@
# versions of individual parts
%define V_perl 5.8.8
%define V_package kolabconf
-%define V_version 1.0
-%define V_release 20070801
+%define V_version 2.1.99
+%define V_release %(date '+%%Y%%m%%d')
# package information
Name: %{V_package}
@@ -67,7 +67,7 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_prefix}/bin/perl-openpkg prepare
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE0} -v -A "--config \"%{l_prefix}/etc/kolab/kolab.globals\" --bin \"%{l_prefix}/sbin\"" configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE0} -A "--config \"%{l_prefix}/etc/kolab/kolab.globals\" --bin \"%{l_prefix}/sbin\"" configure build install
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`
From cvs at kolab.org Wed Aug 1 16:31:37 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:31:37 +0200 (CEST)
Subject: gunnar: server/kolabconf/bin kolabconf.in,1.1,1.2
Message-ID: <20070801143137.6080C60AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/bin
In directory doto:/tmp/cvs-serv18868/bin
Modified Files:
kolabconf.in
Log Message:
Some minor fixes to the new package and some more comments.
Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/kolabconf/bin/kolabconf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolabconf.in 1 Aug 2007 10:38:32 -0000 1.1
+++ kolabconf.in 1 Aug 2007 14:31:35 -0000 1.2
@@ -29,7 +29,7 @@
use strict;
use warnings;
-our $VERSION = '1.0';
+our $VERSION = '2.1.99';
use Getopt::Std;
use Sys::Syslog;
From cvs at kolab.org Wed Aug 1 16:31:37 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:31:37 +0200 (CEST)
Subject: gunnar: server/kolabconf/lib/Kolab Conf.pm,1.2,1.3
Message-ID: <20070801143137.64DB560AE56@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv18868/lib/Kolab
Modified Files:
Conf.pm
Log Message:
Some minor fixes to the new package and some more comments.
Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Conf.pm 1 Aug 2007 12:34:31 -0000 1.2
+++ Conf.pm 1 Aug 2007 14:31:35 -0000 1.3
@@ -832,8 +832,6 @@
1;
__END__
-# Below is stub documentation for your module. You'd better edit it!
-
=head1 NAME
Kolab::Conf - Perl extension for Kolab template generation
From cvs at kolab.org Wed Aug 1 16:36:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:36:26 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib - New directory
Message-ID: <20070801143626.2BFBF60AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/lib
In directory doto:/tmp/cvs-serv19111/lib
Log Message:
Directory /kolabrepository/server/perl-kolab/lib added to the repository
From cvs at kolab.org Wed Aug 1 16:36:28 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:36:28 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib/Kolab - New directory
Message-ID: <20070801143628.EFA5560AE59@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv19118/lib/Kolab
Log Message:
Directory /kolabrepository/server/perl-kolab/lib/Kolab added to the repository
From cvs at kolab.org Wed Aug 1 16:36:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:36:31 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib/Kolab/LDAP - New directory
Message-ID: <20070801143631.BA83B60AE59@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/lib/Kolab/LDAP
In directory doto:/tmp/cvs-serv19127/lib/Kolab/LDAP
Log Message:
Directory /kolabrepository/server/perl-kolab/lib/Kolab/LDAP added to the repository
From cvs at kolab.org Wed Aug 1 16:36:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:36:35 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib/Kolab/LDAP/Backend - New directory
Message-ID: <20070801143635.6B59B60AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend
In directory doto:/tmp/cvs-serv19136/lib/Kolab/LDAP/Backend
Log Message:
Directory /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend added to the repository
From cvs at kolab.org Wed Aug 1 16:41:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:41:23 +0200 (CEST)
Subject: bernhard: doc/raw-howtos mutts_for_kolab.txt,1.7,1.8
Message-ID: <20070801144123.9327A60AE54@lists.intevation.de>
Author: bernhard
Update of /kolabrepository/doc/raw-howtos
In directory doto:/tmp/cvs-serv19307
Modified Files:
mutts_for_kolab.txt
Log Message:
Updated contact information: ML and website.
Replaced bad example domain with a better one ending on example.net.
Index: mutts_for_kolab.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/mutts_for_kolab.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mutts_for_kolab.txt 9 Sep 2005 17:20:37 -0000 1.7
+++ mutts_for_kolab.txt 1 Aug 2007 14:41:21 -0000 1.8
@@ -9,8 +9,8 @@
Source probably available from ftp://ftp.gnupg.org/GnuPG/alpha/aegypten/ .
-General Feedback to the kroupware at kde.org list.
-See kolab.kde.org for more information about Kolab.
+General Feedback to the kolab-users at kolab.org list.
+See www.kolab.org for more information about Kolab.
Capabilities of a specific mutt version
---------------------------------------
@@ -45,8 +45,8 @@
set imap_pass=
set imap_passive=no
set imap_force_ssl=yes
-set spoolfile=imap://kroupware.kroupware-net/INBOX
-set folder=imap://kroupware.kroupware-net/
+set spoolfile=imap://mykolabserver.example.net/INBOX
+set folder=imap://mykolabserver.example.net/
set mail_check=120
You might be prompted to accept the SSL certificate of the server, or you
@@ -74,7 +74,7 @@
following the nullmailer documentation.
For this to work at times it might be useful to explicitely
set return and from path using the following mutt options:
- my_hdr From: Jane Musterfrau
+ my_hdr From: Jane Musterfrau
set envelope_from=yes
Note that the known nullmailer versions at time of writing (=<1.00RC7)
have a bug that prevents sending of MDNs.
@@ -93,7 +93,7 @@
It makes sense to at least give a default you can switch to with Esc-N:
mdn_dnt_defaults none
-mdn_dnt_defaults Jane Musterfrau
+mdn_dnt_defaults Jane Musterfrau
It is possible to place the options in your ~/.muttrc.
Note that mutts will not directly use your ~/.muttrc,
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab/t 1.t,1.1,NONE
Message-ID: <20070801145743.C973F60AE4C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab/t
In directory doto:/tmp/cvs-serv20643/Kolab/t
Removed Files:
1.t
Log Message:
Converted the perl-kolab package into a standard perl library.
--- 1.t DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Conf/t 1.t,1.1,NONE
Message-ID: <20070801145743.CF56F60AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Conf/t
In directory doto:/tmp/cvs-serv20643/Kolab-Conf/t
Removed Files:
1.t
Log Message:
Converted the perl-kolab package into a standard perl library.
--- 1.t DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab Changes, NONE, 1.1 DEVELOPMENT, NONE,
1.1 INSTALL, NONE, 1.1 MANIFEST, NONE, 1.1 Makefile.PL, NONE,
1.1 perl-kolab.spec, 1.97, 1.98 .cvsignore, 1.1, 1.2 AUTHORS,
1.1, 1.2 README, 1.1, 1.2 ChangeLog, 1.21, NONE Makefile.am,
1.12, NONE Makefile.cvs, 1.8, NONE NEWS, 1.1, NONE bootstrap,
1.1, NONE configure.ac, 1.5, NONE perl-kolab.spec.in, 1.31, NONE
Message-ID: <20070801145743.C2813600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv20643
Modified Files:
.cvsignore AUTHORS README
Added Files:
Changes DEVELOPMENT INSTALL MANIFEST Makefile.PL
perl-kolab.spec
Removed Files:
ChangeLog Makefile.am Makefile.cvs NEWS bootstrap configure.ac
perl-kolab.spec.in
Log Message:
Converted the perl-kolab package into a standard perl library.
--- NEW FILE: Changes ---
2007-08-01 Gunnar Wrobel
Converted the perl-kolab package into a standard perl library.
2007-07-31 Gunnar Wrobel
* Kolab/Kolab.pm.in:
* Kolab-Conf/Conf.pm.in:
Require that the configuration load call is provided with the path
to the global Kolab configuration settings. This way we remove the
knowledge that the kolabd package exist from the Kolab.pm script.
In addition the reload() function was moved to the Conf.pm
module.
2007-07-27 Gunnar Wrobel
* Kolab-LDAP/LDAP.pm.in (startup):
Require that the startup call is provided with the path to the
statedir. This way we remove knowledge of the kolabd package from
LDAP.pm script
* Kolab-LDAP-Backend-slurpd/slurpd.pm.in (run):
Removed explicit reference to the kolabconf script. The path is
now read from the Kolab Server configuration. This removes the
knowledge that the kolabd package exists from the slurpd.pm
script.
2007-07-26 Gunnar Wrobel
* Makefile.am:
* Kolab-Mailer/*:
Removed the Kolab-Mailer module. It was only used by the
"dirserv"-code.
* Makefile.am:
* Kolab/Kolab.pm.in:
* Kolab-LDAP/LDAP.pm.in:
* Kolab-LDAP-Backend-dirservd/*:
* Kolab-DirServ/*:
Removed outdated "dirserv"-support from perl-kolab.
2007-06-21 Marcus Hüwe
* Makefile.am: added Makefile dependencies
2006-12-04 Gunnar Wrobel
* Kolab-Conf/Conf.pm.in (build): Only print "No configuration
variable corresponding to `$1' exists" in case we are NOT skipping
the section.
2006-03-20 Marcus Hüwe
Patch commited by Richard Bos
* Kolab-Conf/Conf.pm.in: introduce a new variable phpinit_dir for the
directory that holds the php.ini file to be used.
2006-01-15 Richard Bos
* Kolab-Conf/Conf.pm.in: use the new variable sasl_authdconffile
instead of @sasl_confdir@/saslauthd.conf
2006-01-14 Marcus Hüwe
Patch commited by Richard Bos
* configure.ac: replaced --enable-dist with --with-dist
Added dist_conf file check. If dist_conf file specified with
--with-dist is not present fail configure.
* perl-kolab.spec.in: replaced --enable-dist with --with-dist
2006-01-14 Richard Bos
* Kolab/Kolab.pm.in: check for valid uid/gid values with perl define
instead of the value. The current check failed for root, as that
returns '0' (zero) that was interpreted as false...
* Changed the real login names, kolab, kolab-n and kolab-r to resp.
@kolab_mgrp@, @kolab_usr@ and @kolab_rusr at . The same thing
was done for the groups
2006-01-07 Richard Bos
* Kolab-Conf/Conf.pm.in: do not crash when the file to be checked
does not exists.
Give a hint _which_ config file can not be moved
2006-01-03 Richard Bos
* Makefile.am: distribute only the files to be distributed
from the dist_conf directory
Added a distclean-local rule to remove the directory autom4te.cache
2005-12-30 Richard Bos
* Kolab/Makefile.am,
Kolab-Conf/Makefile.am,
Kolab-Cyrus/Makefile.am,
Kolab-DirServ/Makefile.am,
Kolab-LDAP/Makefile.am,
Kolab-LDAP-Backend/Makefile.am,
Kolab-LDAP-Backend-ad/Makefile.am,
Kolab-LDAP-Backend-dirservd/Makefile.am,
Kolab-LDAP-Backend-slurpd/Makefile.am,
Kolab-Mailer/Makefile.am,
Kolab-Util/Makefile.am: removed. Not needed anymore due
to conversion from autoperl to autotools
2005-12-30 Marcus Hüwe
Patch committed by Richard Bos, see issue1047
* Kolab/Kolab.pm.in: replaced @bindir@/openpkg with @KOLABRC@
2005-12-29 Martin Konold
* configure: removed, not needed anymore due to the conversion to
autotools from autoperl. See issue1038
2005-12-19 Richard Bos
* configure.ac: added no-dist-gzip to AM_INIT_AUTOMAKE
* Makefile.cvs: reflected change in configure.ac, to create only bzipped
tarbals. Changed 'make dist' into 'make distcheck'
2005-12-17 Richard Bos
* dist_conf/gentoo, dist_conf/kolab: removed, they are
not needed anymore as the dist_conf files from kolabd
are used.
2005-12-17 Richard Bos
* NEWS: added
* Makefile.cvs,
perl-kolab.spec.in: updated so the build completes
with the new autoconfiscated perl-kolab
2005-12-17 Marcus Hüwe
Patch committed by Richard Bos
* bootstrap: added
* ChangeLog: added
* Kolab/Kolab.pm,
Kolab-Conf/Conf.pm,
Kolab-DirServ/DirServ.pm,
Kolab-LDAP/LDAP.pm,
Kolab-LDAP-Backend-slurpd/slurpd.pm,
Kolab-Mailer/Mailer.pm: are working now with the updated
kolabd/kolabd/dist_conf file
* Kolab/Makefile.am,
Kolab-Mailer/Makefile.am,
Kolab-Conf/Makefile.am,
Kolab-LDAP/Makefile.am,
Kolab-Util/Makefile.am,
Kolab-Cyrus/Makefile.am,
Kolab-LDAP-Backend/Makefile.am,
Kolab-LDAP-Backend-ad/Makefile.am,
Kolab-LDAP-Backend-slurpd/Makefile.am,
Kolab-DirServ/Makefile.am,
Kolab-LDAP-Backend-dirservd/Makefile.am,
Makefile.am: are removed
* Kolab/Makefile.PL,
Kolab-Mailer/Makefile.PL,
Kolab-Conf/Makefile.PL,
Kolab-LDAP/Makefile.PL,
Kolab-Util/Makefile.PL,
Kolab-Cyrus/Makefile.PL,
Kolab-LDAP-Backend/Makefile.PL,
Kolab-LDAP-Backend-ad/Makefile.PL,
Kolab-LDAP-Backend-slurpd/Makefile.PL,
Kolab-DirServ/Makefile.PL,
Kolab-LDAP-Backend-dirservd/Makefile.PL: are removed
--- NEW FILE: DEVELOPMENT ---
Development notes
=================
The kolabconf package is a standard perl package meant to be handled
with the Makefile.PL script.
The Kolab Server packages were usually not released as source
packages. This should be changed with this new package layout. The
"dist" target will produce a kolabconf-*.tar.gz package that can be
distributed as source package. The same run will produce a
kolabconf-*.src.rpm package that is suited for installation on an
OpenPKG system.
Version numbering
=================
kolabconf is a Kolab Server core package. It should have the same
version as the Server release. As a part of Kolab Server 2.1 the
version number should be 2.1.
Once development picks up after a release, the version number should
be switched to $(OLD_VERSION).99 e.g. 2.1.99. There'll be no changes
of the version during development as there are no source packages
being released.
For the next release the version number will be increased to the new
Kolab Server version e.g. 2.2 and a new source packge will be
provided.
A NEW VERSION HAS TO BE SET IN BOTH
lib/Kolab.pm
AND
perl-kolab.spec
For testing purposes the "dist" target will produce source RPM
packages that have the current date attached as release number. This
allows you to continuously upgrade your test installation.
--- NEW FILE: INSTALL ---
INSTALLATION
To install this module type the following:
perl Makefile.PL
make
make test
make install
DEPENDENCIES
This package requires the following Perl modules:
* Perl core packages
IO::File
IO::Select
IO::Socket::INET
Sys::Syslog
Time::Local
URI
* Perl addon modules
Convert::ASN1
DB_File
Net::LDAP
Net::LDAP::ASN
Net::LDAP::Control
Net::LDAP::Constant
Net::LDAP::Util
Net::LDAPS
Cyrus::IMAP::Admin
package.
--- NEW FILE: MANIFEST ---
AUTHORS
Changes
INSTALL
lib/Kolab.pm
lib/Kolab/Cyrus.pm
lib/Kolab/LDAP.pm
lib/Kolab/LDAP/Backend.pm
lib/Kolab/LDAP/Backend/ad.pm
lib/Kolab/LDAP/Backend/slurpd.pm
lib/Kolab/Util.pm
Makefile.PL
MANIFEST
README
--- NEW FILE: Makefile.PL ---
use 5.008;
use strict;
use warnings;
use ExtUtils::MakeMaker;
use Getopt::Long;
# Add the dist_openpkg target to the dist target
sub MY::dist {
package MY; # To help SUPER work right
my $self = shift;
my @m;
push(@m, $self->SUPER::dist(@_));
my $dist = join "", @m;
$dist =~ s/(dist.*)/$1 dist_openpkg/;
return $dist;
}
# Remove additional files
sub MY::veryclean {
package MY; # To help SUPER work right
my $self = shift;
my @m;
push(@m, $self->SUPER::clean(@_));
my $clean = join "", @m;
$clean =~ s/(clean.*)/$1 clean_openpkg clean_scripts/;
return $clean;
}
sub MY::postamble {
my $add = "
ifeq \"x\$(RPM)\" \"x\"
RPM = \$(HOME)/bin/openpkg rpm
endif
ifeq \"x\$(KOLABRPMSRC)\" \"x\"
KOLABRPMSRC = /kolab/RPM/SRC
endif
ifeq \"x\$(KOLABRPMPKG)\" \"x\"
KOLABRPMPKG = /kolab/RPM/PKG
endif
ifeq \"x\$(KOLABRPMTMP)\" \"x\"
KOLABRPMTMP = /kolab/RPM/TMP
endif
PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
VERSION = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_version' perl-kolab.spec | sed -e 's/.*V_version\\s*\\([0-9.]*\\).*/\\1/')
RELEASE = \$(shell date '+%Y%m%d')
clean_all: veryclean
rm -rf \$(KOLABRPMTMP)/\$(PACKAGE)
rm -rf \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm
rm -rf *.tar.gz
rm -rf *~
dist_openpkg: perl-kolab.spec \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm
cp \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm ../stage/
\$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm: \$(PACKAGE).spec
test -d \$(KOLABRPMSRC)/\$(PACKAGE) || mkdir \$(KOLABRPMSRC)/\$(PACKAGE)
cp \$(PACKAGE).spec \$(KOLABRPMSRC)/\$(PACKAGE)
cp \$(PACKAGE)-\$(VERSION).tar.gz \$(KOLABRPMSRC)/\$(PACKAGE)
cd \$(KOLABRPMSRC)/\$(PACKAGE) && \$(RPM) -ba \$(PACKAGE).spec
cp -p \$(KOLABRPMPKG)/\$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm .
";
return $add;
}
WriteMakefile(
NAME => 'perl-kolab',
VERSION_FROM => 'lib/Kolab.pm',
INSTALLDIRS => 'vendor',
ABSTRACT =>
'perl-kolab provides a basic set of perl modules required for the
Kolab Groupware server.',
AUTHOR => 'Stuart Bingë and others (see AUTHORS file)'
);
Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/perl-kolab/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore 12 Mar 2007 14:31:33 -0000 1.1
+++ .cvsignore 1 Aug 2007 14:57:41 -0000 1.2
@@ -1,13 +1,5 @@
-COPYING
-INSTALL
+*.tar.gz
Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-dist_conf
-install-sh
-missing
-perl-kolab.spec
+blib
+pm_to_blib
+*.src.rpm
Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/perl-kolab/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AUTHORS 17 Dec 2005 21:45:32 -0000 1.1
+++ AUTHORS 1 Aug 2007 14:57:41 -0000 1.2
@@ -1 +1,39 @@
-Marcus Hüwe and Richard Bos autoconfiscated perl-kolab
+Originally written by Stuart Bingë
+
+ Copyright (c) 2003 - 2004 Stuart Bingë
+ Copyright (c) 2003 - 2004 Code Fusion cc
+
+Portions based on work by the following people:
+
+ (c) 2003 Tassilo Erlewein
+ (c) 2003 Achim Frank
+ (c) 2004 Stephan Buys
+ (c) 2005 - 2006 Richard Bos
+ (c) 2005 - 2006 Marcus Hüwe
+ (c) 2004 - 2006 Steffen Hansen
+ (c) 2007 Thomas Arendsen Hein
+ (c) 2006 - 2007 Gunnar Wrobel
+ (c) 2003 - 2007 Martin Konold
+
+
+Portions based on work by the following companies:
+
+ (c) 2003 Code Fusion cc
+ (c) 2004 - 2006 Klaraelvdalens Datakonsult AB
+ (c) 2007 Intevation GmbH
+ (c) 2006 - 2007 p at rdus
+ (c) 2003 - 2007 Erfrakon
+
+
+Contributions by the following people:
+
+
+
+(Established based on the following guidlines:
+
+ People with CVS access and more than two commits are being listed in
+ the first list, their corresponding company in the second list. The
+ order of appearences is sorted by date of last contribution, longest
+ period of contributions and finally based on alphabetical order. The
+ listed contributors comitted less than three patches or do not have
+ CVS access.)
\ No newline at end of file
Index: README
===================================================================
RCS file: /kolabrepository/server/perl-kolab/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README 31 Mar 2004 15:36:38 -0000 1.1
+++ README 1 Aug 2007 14:57:41 -0000 1.2
@@ -1 +1,24 @@
-Imported versions are all 0.9, with the exception of Kolab-LDAP-Backend-dirservd which was 0.91
+perl-kolab
+==========
+
+perl-kolab provides a basic set of perl modules required for the Kolab
+Groupware server.
+
+COPYRIGHT
+
+See the AUTHORS file provided with this package.
+
+LICENCE
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You can view the GNU General Public License, online, at the GNU
+Project's homepage; see .
--- ChangeLog DELETED ---
--- Makefile.am DELETED ---
--- Makefile.cvs DELETED ---
--- NEWS DELETED ---
--- bootstrap DELETED ---
--- configure.ac DELETED ---
--- perl-kolab.spec.in DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Cyrus/t 1.t,1.1,NONE
Message-ID: <20070801145743.D66EC60AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Cyrus/t
In directory doto:/tmp/cvs-serv20643/Kolab-Cyrus/t
Removed Files:
1.t
Log Message:
Converted the perl-kolab package into a standard perl library.
--- 1.t DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Cyrus Changes, 1.1, NONE Cyrus.pm, 1.9,
NONE MANIFEST, 1.1, NONE META.yml, 1.1, NONE
Message-ID: <20070801145743.D3A31600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Cyrus
In directory doto:/tmp/cvs-serv20643/Kolab-Cyrus
Removed Files:
Changes Cyrus.pm MANIFEST META.yml
Log Message:
Converted the perl-kolab package into a standard perl library.
--- Changes DELETED ---
--- Cyrus.pm DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:44 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend-slurpd/t 1.t,1.1,NONE
Message-ID: <20070801145744.0072C600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd/t
In directory doto:/tmp/cvs-serv20643/Kolab-LDAP-Backend-slurpd/t
Removed Files:
1.t
Log Message:
Converted the perl-kolab package into a standard perl library.
--- 1.t DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend Backend.pm, 1.3,
NONE Changes, 1.1, NONE MANIFEST, 1.1, NONE META.yml, 1.1, NONE
Message-ID: <20070801145743.E215B60AE5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend
In directory doto:/tmp/cvs-serv20643/Kolab-LDAP-Backend
Removed Files:
Backend.pm Changes MANIFEST META.yml
Log Message:
Converted the perl-kolab package into a standard perl library.
--- Backend.pm DELETED ---
--- Changes DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:44 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Util Changes, 1.1, NONE MANIFEST, 1.1,
NONE META.yml, 1.1, NONE Util.pm, 1.3, NONE
Message-ID: <20070801145744.0483660AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Util
In directory doto:/tmp/cvs-serv20643/Kolab-Util
Removed Files:
Changes MANIFEST META.yml Util.pm
Log Message:
Converted the perl-kolab package into a standard perl library.
--- Changes DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
--- Util.pm DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP/t 1.t,1.1,NONE
Message-ID: <20070801145743.DDE7560AE59@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP/t
In directory doto:/tmp/cvs-serv20643/Kolab-LDAP/t
Removed Files:
1.t
Log Message:
Converted the perl-kolab package into a standard perl library.
--- 1.t DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab Changes, 1.1, NONE Kolab.pm.in, 1.8,
NONE MANIFEST, 1.1, NONE META.yml, 1.1, NONE
Message-ID: <20070801145743.C7751600172@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab
In directory doto:/tmp/cvs-serv20643/Kolab
Removed Files:
Changes Kolab.pm.in MANIFEST META.yml
Log Message:
Converted the perl-kolab package into a standard perl library.
--- Changes DELETED ---
--- Kolab.pm.in DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Conf Changes, 1.2, NONE Conf.pm.in,
1.13, NONE MANIFEST, 1.1, NONE META.yml, 1.1, NONE
Message-ID: <20070801145743.CC17460AE50@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv20643/Kolab-Conf
Removed Files:
Changes Conf.pm.in MANIFEST META.yml
Log Message:
Converted the perl-kolab package into a standard perl library.
--- Changes DELETED ---
--- Conf.pm.in DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend-slurpd Changes, 1.1,
NONE MANIFEST, 1.1, NONE META.yml, 1.1, NONE slurpd.pm.in, 1.3, NONE
Message-ID: <20070801145743.F1B0160AE5B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd
In directory doto:/tmp/cvs-serv20643/Kolab-LDAP-Backend-slurpd
Removed Files:
Changes MANIFEST META.yml slurpd.pm.in
Log Message:
Converted the perl-kolab package into a standard perl library.
--- Changes DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
--- slurpd.pm.in DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend-ad Changes, 1.1,
NONE MANIFEST, 1.1, NONE META.yml, 1.1, NONE ad.pm, 1.2, NONE
Message-ID: <20070801145743.E913F60AE4C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-ad
In directory doto:/tmp/cvs-serv20643/Kolab-LDAP-Backend-ad
Removed Files:
Changes MANIFEST META.yml ad.pm
Log Message:
Converted the perl-kolab package into a standard perl library.
--- Changes DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
--- ad.pm DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend/t 1.t,1.1,NONE
Message-ID: <20070801145743.E7126600172@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend/t
In directory doto:/tmp/cvs-serv20643/Kolab-LDAP-Backend/t
Removed Files:
1.t
Log Message:
Converted the perl-kolab package into a standard perl library.
--- 1.t DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP Changes, 1.1, NONE LDAP.pm.in,
1.9, NONE MANIFEST, 1.1, NONE META.yml, 1.1, NONE
Message-ID: <20070801145743.DB21F60AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP
In directory doto:/tmp/cvs-serv20643/Kolab-LDAP
Removed Files:
Changes LDAP.pm.in MANIFEST META.yml
Log Message:
Converted the perl-kolab package into a standard perl library.
--- Changes DELETED ---
--- LDAP.pm.in DELETED ---
--- MANIFEST DELETED ---
--- META.yml DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:44 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib Kolab.pm,NONE,1.1
Message-ID: <20070801145744.0CA93600172@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/lib
In directory doto:/tmp/cvs-serv20643/lib
Added Files:
Kolab.pm
Log Message:
Converted the perl-kolab package into a standard perl library.
--- NEW FILE: Kolab.pm ---
package Kolab;
## COPYRIGHT
## ---------
##
## See AUTHORS file
##
##
## LICENSE
## -------
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
## published by the Free Software Foundation; either version 2, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You can view the GNU General Public License, online, at the GNU
## Project's homepage; see .
##
## $Revision: 1.1 $
use 5.008;
use strict;
use warnings;
use Sys::Syslog;
use URI;
use Net::LDAP;
use Kolab::Util;
#use Kolab::LDAP;
use vars qw(%config $reloadOk);
require Exporter;
our @ISA = qw(Exporter);
our %EXPORT_TAGS = (
'all' => [ qw(
%config
$reloadOk
&reloadConfig
&reload
&log
) ]
);
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw(
&KOLAB_SILENT
&KOLAB_ERROR
&KOLAB_WARN
&KOLAB_INFO
&KOLAB_DEBUG
);
our $VERSION = '2.1.99';
sub KOLAB_SILENT() { 0 }
sub KOLAB_ERROR() { 1 }
sub KOLAB_WARN() { 2 }
sub KOLAB_INFO() { 3 }
sub KOLAB_DEBUG() { 4 }
sub reloadConfig
{
my $kolab_globals = shift;
my $tempval;
my $ldap;
my $error = 0;
# `log_level' specifies what severity of messages we want to see in the logs.
# Possible values are:
# 0 - Silent
# 1 - Errors
# 2 - Warnings & Errors
# 3 - Info, Warnings & Errors (DEFAULT)
# 4 - Debug (i.e. everything)
# First read `kolab.globals'
%config = readConfig(%config, $kolab_globals);
# Determine the root of the kolab installation, and read `kolab.globals'
# Notice that the location of the files is handled by dist_conf,
# so we don't use $tempval for anything other than storing it in
# $config{'prefix'}. Once prefix is not in use anywhere, we can remove
# this code. /steffen
$tempval = (getpwnam($config{'kolab_musr'}))[7];
if (! defined $tempval) {
$config{'log_level'} = KOLAB_WARN;
&log('C', 'Unable to determine the kolab user main directory', KOLAB_ERROR);
$error = 1;
} else {
$config{'prefix'} = $tempval;
}
# Now read `kolab.conf', overwriting values read from `kolab.globals'
%config = readConfig(\%config, $config{'kolab_locals'});
$config{'debug'} = 0 if (!exists $config{'debug'});
$config{'log_level'} = KOLAB_WARN if (!exists $config{'log_level'});
&log('C', 'Reloading configuration');
# Get the UID/GID of the 'kolab' users
$config{'kolab_uid'} = (getpwnam($config{'kolab_musr'}))[2];
if (!defined $config{'kolab_uid'}) {
&log('C', "Unable to determine the uid of user '$config{'kolab_musr'}'", KOLAB_ERROR);
$error = 1;
}
$config{'kolab_gid'} = (getgrnam($config{'kolab_mgrp'}))[2];
if (!defined $config{'kolab_gid'}) {
&log('C', "Unable to determine the gid of user '$config{'kolab_mgrp'}'", KOLAB_ERROR);
$error = 1;
}
$config{'kolab_n_uid'} = (getpwnam($config{'kolab_usr'}))[2];
if (!defined $config{'kolab_n_uid'}) {
&log('C', "Unable to determine the uid of user '$config{'kolab_usr'}", KOLAB_ERROR);
$error = 1;
}
$config{'kolab_n_gid'} = (getgrnam($config{'kolab_grp'}))[2];
if (!defined $config{'kolab_n_gid'}) {
&log('C', "Unable to determine the gid of user $config{'kolab_grp'}", KOLAB_ERROR);
$error = 1;
}
$config{'kolab_r_uid'} = (getpwnam($config{'kolab_rusr'}))[2];
if (!defined $config{'kolab_r_uid'}) {
&log('C', "Unable to determine the uid of user '$config{'kolab_rusr'}'", KOLAB_ERROR);
$error = 1;
}
$config{'kolab_r_gid'} = (getgrnam($config{'kolab_rgrp'}))[2];
if (!defined $config{'kolab_r_gid'}) {
&log('C', "Unable to determine the gid of user '$config{'kolab_rgrp'}'", KOLAB_ERROR);
$error = 1;
}
# Make sure the critical variables we need were defined in kolab.conf
if (!exists $config{'bind_dn'} || !exists $config{'bind_pw'} || !exists $config{'ldap_uri'} || !exists $config{'base_dn'}) {
&log('C', "One or more required configuration variables (`bind_dn', `bind_pw', `ldap_uri' and/or `base_dn') are missing in `kolab.conf'", KOLAB_ERROR);
$error = 1;
}
# Make a hash of the bind password available too
if( !exists $config{'bind_pw_hash'} ) {
my $hashcmd = $config{'hashmethod'} . " '".$config{'bind_pw'}."'";
$config{'bind_pw_hash'} = `$hashcmd`;
chomp($config{'bind_pw_hash'});
}
# Retrieve the LDAP values of the main kolab object to complete our config hash
if (!($tempval = URI->new($config{'ldap_uri'}))) {
&log('C', "Unable to parse ldap_uri `" . $config{'ldap_uri'} . "'", KOLAB_ERROR);
$error = 1;
} else {
$config{'ldap_ip'} = $tempval->host;
$config{'ldap_port'} = $tempval->port;
}
# `kolab_dn' points to the main kolab object in LDAP
# Defaults to `k=kolab,$base_dn' if not specified (for backwards compatibility)
$config{'kolab_dn'} = "k=kolab," . $config{'base_dn'} if (!exists $config{'kolab_dn'});
if ($config{'kolab_dn'} eq '') {
&log('C', "`kolab_dn' is empty; skipping LDAP read");
} else {
my $mesg;
my $ldapobject;
if (!($ldap = Net::LDAP->new($config{'ldap_uri'}, verify => 'none' ))) {
&log('C', "Unable to connect to LDAP server `" . $config{'ldap_ip'} . ":" . $config{'ldap_port'} . "'", KOLAB_ERROR);
$error = 1;
}
$mesg = $ldap->bind($config{'bind_dn'}, password => $config{'bind_pw'}) if $ldap;
if ($ldap && $mesg->code) {
&log('C', "Unable to bind to DN `" . $config{'bind_dn'} . "'", KOLAB_ERROR);
$error = 1;
}
#$ldap = Kolab::LDAP::create(
# $config{'ldap_ip'},
# $config{'ldap_port'},
# $config{'bind_dn'},
# $config{'bind_pw'},
# 1
#);
if ($ldap) {
$mesg = $ldap->search(
base => $config{'kolab_dn'},
scope => 'base',
filter => '(objectclass=*)'
);
if (!$mesg->code) {
$ldapobject = $mesg->pop_entry;
foreach $tempval ($ldapobject->attributes) {
my $vals = $ldapobject->get_value($tempval, asref => 1 );
if( !ref($vals) ) {
# Not a ref at all???
&log('C', "Attribute $tempval does not exist", KOLAB_WARN );
} elsif( @{$vals} == 1 ) {
$config{lc($tempval)} = $vals->[0];
} else {
$config{lc($tempval)} = $vals;
}
}
} else {
&log('C', "Unable to find kolab object `" . $config{'kolab_dn'} . "'", KOLAB_ERROR);
# exit(1);
$error = 1;
}
} else {
&log('C', "Unable to read configuration data from LDAP", KOLAB_WARN);
}
}
# At this point we have read in all user-specified configuration variables.
# We now need to go through the list of all possible configuration variables
# and set the default values of those that were not overridden.
# ProFTPd password
if (exists $config{'proftpd-userPassword'}) {
my $salt = substr($config{'proftpd-userPassword'}, 0, 2);
$config{'proftpd-userPassword'} = crypt($config{'proftpd-userPassword'}, $salt);
} else {
$config{'proftpd-userPassword'} = '';
}
$config{'fqdn'} = trim(`hostname`);
# Cyrus admin account
$tempval = $config{'cyrus-admins'} || 'manager';
(my $cmanager, my $dummy) = split(/ /, $tempval, 2);
$config{'cyrus_admin'} = $cmanager if (!exists $config{'cyrus_admin'});
$config{'cyrus_admin_pw'} = $config{'bind_pw'} if (!exists $config{'cyrus_admin_pw'});
# `directory_mode' specifies what backend to use (for the main kolab
# object - for the other objects see their respective XXX_directory_mode).
# Defaults to `slurpd'
#
# NOTE: A plugin scheme is used for this; the backend module loaded
# is `Kolab::LDAP::$config{'directory_mode'}, so anyone is able to slot
# in a new Kolab::LDAP:: module, change `directory_mode' and have the new
# module used as a backend (as long as it conforms to the correct
# interface, that is).
#
# Currently supported backends:
# `ad' - Active Directory
$config{'directory_mode'} = 'slurpd' if (!exists $config{'directory_mode'});
# `conn_refresh_period' specifies how many minutes to wait before forceably
# tearing down the change listener connection, re-syncing, and re-connecting.
# Used by the AD backend.
# Defaults to one hour.
# $config{'conn_refresh_period'} = 60 if (!exists $config{'conn_refresh_period'});
# `slurpd_port' specifies what port the kolab slurpd replication daemon listens on
# Defaults to 9999 for backwards compatibility
# $config{'slurpd_port'} = 9999 if (!exists $config{'slurpd_port'});
# `user_ldap_uri', `user_bind_dn', `user_bind_pw' and `user_dn_list' are
# used to specify the DNs where user objects are located. They default to
# `ldap_uri', `bind_dn', `bind_pw' and `base_dn', respectively.
#
# NOTE: `user_dn_list' is a semi-colon separated list of DNs, as opposed
# to a single DN (such as `kolab_dn').
#
# TODO: Expand this to allow all separate entities (kolab object, users,
# shared folders, etc) to exist in user-specified locations
#
# TODO: Check Postfix LDAP aliasing when user_dn_list contains more than
# one DN.
$config{'user_ldap_uri'} = $config{'ldap_uri'} if (!exists $config{'user_ldap_uri'});
if (!($tempval = URI->new($config{'user_ldap_uri'}))) {
&log('C', "Unable to parse user_ldap_uri `" . $config{'user_ldap_uri'} . "'", KOLAB_ERROR);
# exit(1);
$error = 1;
} else {
$config{'user_ldap_ip'} = $tempval->host;
$config{'user_ldap_port'} = $tempval->port;
}
$config{'user_bind_dn'} = $config{'bind_dn'} if (!exists $config{'user_bind_dn'});
$config{'user_bind_pw'} = $config{'bind_pw'} if (!exists $config{'user_bind_pw'});
$config{'user_dn_list'} = $config{'base_dn'} if (!exists $config{'user_dn_list'});
$config{'user_directory_mode'} = $config{'directory_mode'} if (!exists $config{'user_directory_mode'});
# `user_object_class' denotes what object class to search for when locating users.
# Defaults to `inetOrgPerson'
$config{'user_object_class'} = 'inetOrgPerson' if (!exists $config{'user_object_class'});
# This part sets various backend-specific LDAP fields (if they have not been
# overridden) based on `directory_mode'.
#
# `user_delete_flag' is used to test whether a user object has been deleted
# `user_field_modified' is used to test whether a user object has been modified
# `user_field_guid' indicates a field that can be considered globally unique to the object
# `user_field_quota' indicates a field that stores the cyrus quota for the user
if ($config{'user_directory_mode'} eq 'ad') {
# AD
$config{'user_field_deleted'} = 'isDeleted' if (!exists $config{'user_field_deleted'});
$config{'user_field_modified'} = 'whenChanged' if (!exists $config{'user_field_modified'});
$config{'user_field_guid'} = 'objectGUID' if (!exists $config{'user_field_guid'});
$config{'user_field_quota'} = 'userquota' if (!exists $config{'user_field_quota'});
} else {
# slurd/default
$config{'user_field_deleted'} = 'kolabdeleteflag' if (!exists $config{'user_field_deleted'});
$config{'user_field_modified'} = 'modifytimestamp' if (!exists $config{'user_field_modified'});
$config{'user_field_guid'} = 'entryUUID' if (!exists $config{'user_field_guid'});
$config{'user_field_quota'} = 'cyrus-userquota' if (!exists $config{'user_field_quota'});
}
# The `sf_XXX' variables are the shared folder equivalents of the `user_XXX' variables
$config{'sf_ldap_uri'} = $config{'ldap_uri'} if (!exists $config{'sf_ldap_uri'});
if (!($tempval = URI->new($config{'sf_ldap_uri'}))) {
&log('C', "Unable to parse sf_ldap_uri `" . $config{'sf_ldap_uri'} . "'", KOLAB_ERROR);
# exit(1);
$error = 1;
} else {
$config{'sf_ldap_ip'} = $tempval->host;
$config{'sf_ldap_port'} = $tempval->port;
}
$config{'sf_bind_dn'} = $config{'bind_dn'} if (!exists $config{'sf_bind_dn'});
$config{'sf_bind_pw'} = $config{'bind_pw'} if (!exists $config{'sf_bind_pw'});
$config{'sf_dn_list'} = $config{'base_dn'} if (!exists $config{'sf_dn_list'});
$config{'sf_directory_mode'} = $config{'directory_mode'} if (!exists $config{'sf_directory_mode'});
$config{'sf_object_class'} = 'kolabsharedfolder' if (!exists $config{'sf_object_class'});
if ($config{'sf_directory_mode'} eq 'ad') {
# AD
$config{'sf_field_deleted'} = 'isDeleted' if (!exists $config{'sf_field_deleted'});
$config{'sf_field_modified'} = 'whenChanged' if (!exists $config{'sf_field_modified'});
$config{'sf_field_guid'} = 'entryUUID' if (!exists $config{'sf_field_guid'});
$config{'sf_field_quota'} = 'userquota' if (!exists $config{'sf_field_quota'});
} else {
# slurd/default
$config{'sf_field_deleted'} = 'kolabdeleteflag' if (!exists $config{'sf_field_deleted'});
$config{'sf_field_modified'} = 'modifytimestamp' if (!exists $config{'sf_field_modified'});
$config{'sf_field_guid'} = 'entryUUID' if (!exists $config{'sf_field_guid'});
$config{'sf_field_quota'} = 'cyrus-userquota' if (!exists $config{'sf_field_quota'});
}
# The `group_XXX' variables are the distribution list/groups
# equivalents of the `user_XXX' variables
$config{'group_ldap_uri'} = $config{'ldap_uri'} if (!exists $config{'group_ldap_uri'});
if (!($tempval = URI->new($config{'group_ldap_uri'}))) {
&log('C', "Unable to parse group_ldap_uri `" . $config{'group_ldap_uri'} . "'", KOLAB_ERROR);
# exit(1);
$error = 1;
} else {
$config{'group_ldap_ip'} = $tempval->host;
$config{'group_ldap_port'} = $tempval->port;
}
$config{'group_bind_dn'} = $config{'bind_dn'} if (!exists $config{'group_bind_dn'});
$config{'group_bind_pw'} = $config{'bind_pw'} if (!exists $config{'group_bind_pw'});
$config{'group_dn_list'} = $config{'base_dn'} if (!exists $config{'group_dn_list'});
$config{'group_directory_mode'} = $config{'directory_mode'} if (!exists $config{'group_directory_mode'});
$config{'group_object_class'} = 'kolabgroupofnames' if (!exists $config{'group_object_class'});
if ($config{'group_directory_mode'} eq 'ad') {
# AD
$config{'group_field_deleted'} = 'isDeleted' if (!exists $config{'group_field_deleted'});
$config{'group_field_modified'} = 'whenChanged' if (!exists $config{'group_field_modified'});
$config{'group_field_guid'} = 'entryUUID' if (!exists $config{'group_field_guid'});
} else {
# slurd/default
$config{'group_field_deleted'} = 'kolabdeleteflag' if (!exists $config{'group_field_deleted'});
$config{'group_field_modified'} = 'modifytimestamp' if (!exists $config{'group_field_modified'});
$config{'group_field_guid'} = 'entryUUID' if (!exists $config{'group_field_guid'});
}
# `gyard_deletion_period' specifies how many minutes to leave lost users in
# the graveyard before deleting them.
# Defaults to seven days.
# $config{'gyard_deletion_period'} = 7 * 24 * 60 if (!exists $config{'gyard_deletion_period'});
# That's it! We now have our config hash.
#Kolab::LDAP::destroy($ldap);
if (defined($ldap) && $ldap->isa('Net::LDAP')) {
$ldap->unbind;
$ldap->disconnect;
}
&log('C', 'Finished reloading configuration');
$reloadOk = !$error;
}
sub log
{
my $prefix = shift;
my $text = shift;
my $priority = shift || KOLAB_INFO;
my $level = $config{'log_level'};
if ($level >= $priority) {
if ($priority == KOLAB_ERROR) {
$text = $prefix . ' Error: ' . $text;
} elsif ($priority == KOLAB_WARN) {
$text = $prefix . ' Warning: ' . $text;
} elsif ($priority == KOLAB_DEBUG) {
$text = $prefix . ' Debug: ' . $text;
} else {
$text = $prefix . ': ' . $text;
}
syslog('info', "$text");
}
print STDERR "$text\n" if ($config{'debug'});
}
1;
__END__
=head1 NAME
Kolab - Perl extension for general Kolab settings.
=head1 ABSTRACT
Kolab contains code used for loading the configuration values from
kolab.conf and LDAP, as well as functions for logging.
=head1 COPYRIGHT AND AUTHORS
Stuart Bingë and others (see AUTHORS file)
=head1 LICENSE
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You can view the GNU General Public License, online, at the GNU
Project's homepage; see .
=cut
From cvs at kolab.org Wed Aug 1 16:57:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:44 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib/Kolab Cyrus.pm, NONE, 1.1 LDAP.pm, NONE,
1.1 Util.pm, NONE, 1.1
Message-ID: <20070801145744.14D1E60AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv20643/lib/Kolab
Added Files:
Cyrus.pm LDAP.pm Util.pm
Log Message:
Converted the perl-kolab package into a standard perl library.
--- NEW FILE: Cyrus.pm ---
package Kolab::Cyrus;
## COPYRIGHT
## ---------
##
## See AUTHORS file
##
##
## LICENSE
## -------
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
## published by the Free Software Foundation; either version 2, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You can view the GNU General Public License, online, at the GNU
## Project's homepage; see .
##
## $Revision: 1.1 $
use 5.008;
use strict;
use warnings;
use Cyrus::IMAP::Admin;
use Kolab::Util;
use Kolab;
require Exporter;
our @ISA = qw(Exporter);
our %EXPORT_TAGS = (
'all' => [ qw(
&create
&createUid
&createMailbox
&deleteMailbox
&setQuota
&setACL
) ]
);
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw(
);
our $VERSION = '0.9';
sub create
{
Kolab::log('Y', 'Connecting to local Cyrus admin interface');
my $cyrus = Cyrus::IMAP::Admin->new('localhost');
if (!$cyrus) {
Kolab::log('Y', 'Unable to connect to local Cyrus admin interface', KOLAB_ERROR);
return 0;
}
if (!$cyrus->authenticate(
'User' => $Kolab::config{'cyrus_admin'},
'Password' => $Kolab::config{'cyrus_admin_pw'},
'Mechanism' => 'LOGIN',
)) {
Kolab::log('Y', "Unable to authenticate with Cyrus admin interface, Error = `" . $cyrus->error . "'", KOLAB_ERROR);
return 0;
}
return $cyrus;
}
sub createUid
{
my $user = shift;
my $sf = shift || 0;
my $seperator = '/';
my $uidprefix = 'user';
if ($sf) {
$seperator = '.';
$uidprefix = 'shared';
}
return $uidprefix . $seperator . $user;
# return 'user' . ($sf ? '.' : '/') . $user;
}
sub createMailbox
{
my $cyrus = shift;
my $uid = shift;
my $sf = shift || 0;
my $cyruid = &createUid($uid, $sf);
my $mailbox = ($cyrus->list($cyruid))[0];
if ($uid && ($uid ne $Kolab::config{'cyrus_admin'}) && ($uid ne "freebusy") && ($uid ne "nobody") && !defined($mailbox)) {
Kolab::log('Y', "Creating mailbox `$cyruid'");
if (!$cyrus->create($cyruid)) {
Kolab::log('Y', "Unable to create mailbox `$cyruid', Error = `" . $cyrus->error . "'", KOLAB_WARN);
}
} else {
Kolab::log('Y', "Skipping mailbox creation for $uid (curuid='$cyruid', mailbox='".join(',',@{$mailbox})."'", KOLAB_DEBUG);
}
}
sub setQuota
{
my $cyrus = shift;
my $uid = shift;
my $quota = shift || 0;
my $sf = shift || 0;
my $cyruid = &createUid($uid, $sf);
if( $quota < 0 ) {
return;
}
(my $root, my %quota) = $cyrus->quotaroot($cyruid);
my $setquota = $quota{'STORAGE'}[1];
if (!defined($setquota) || ($setquota != $quota)) {
if( $quota == 0 ) {
Kolab::log('Y', "Removing quota from mailbox `$cyruid'");
if (!$cyrus->setquota($cyruid)) {
Kolab::log('Y', "Unable to remove quota for mailbox `$cyruid', Error = `" . $cyrus->error . "'", KOLAB_WARN);
}
} else {
Kolab::log('Y', "Setting quota of mailbox `$cyruid' to $quota");
if (!$cyrus->setquota($cyruid, 'STORAGE', $quota)) {
Kolab::log('Y', "Unable to set quota for mailbox `$cyruid', Error = `" . $cyrus->error . "'", KOLAB_WARN);
}
}
}
}
sub deleteMailbox
{
my $cyrus = shift;
my $uid = shift;
my $sf = shift || 0;
my $cyruid = &createUid($uid, $sf);
Kolab::log('Y', "Removing mailbox `$cyruid'");
if (!$cyrus->setacl($cyruid, $Kolab::config{'cyrus_admin'}, 'c')) {
Kolab::log('Y', "Unable to reset ACL of mailbox `$cyruid', Error = `" . $cyrus->error . "'", KOLAB_WARN);
}
if (!$cyrus->delete($cyruid)) {
Kolab::log('Y', "Unable to remove mailbox `$cyruid', Error = `" . $cyrus->error . "'", KOLAB_WARN);
}
}
sub setACL
{
my $cyrus = shift;
my $uid = shift;
my $sf = shift || 0;
my $cyruid = &createUid($uid, $sf);
Kolab::log('Y', "Setting up ACL of mailbox `$cyruid'");
my $prefix = $Kolab::config{'prefix'};
my %acls = $cyrus->listacl( $cyruid );
my ($user, $entry, $acl);
Kolab::log('Y', "Removing users from ACL of $cyruid (users are \"".join(', ', keys %acls)."\")", KOLAB_DEBUG);
foreach $user ( keys %acls) {
Kolab::log('Y', "Removing `$user' from the ACL of mailbox `$cyruid'");
if (!$cyrus->deleteacl($cyruid, $user)) {
Kolab::log('Y', "Unable to remove `$user' from the ACL of mailbox `$cyruid', Error = `" . $cyrus->error . "'", KOLAB_WARN);
}
}
Kolab::log('Y', "Add users from ACL of $cyruid", KOLAB_DEBUG);
my $newacl = shift;
foreach $entry (@$newacl) {
Kolab::log('Y', "Setting up ACL `$entry'", KOLAB_DEBUG);
($user, $acl) = split(/ /, $entry , 2);
Kolab::log('Y', "Split `$user' and `$acl'", KOLAB_DEBUG);
$user = trim($user);
$acl = trim($acl);
Kolab::log('Y', "Setting the ACL of user `$user' in mailbox `$cyruid' to $acl");
if (!$cyrus->setacl($cyruid, $user, $acl)) {
Kolab::log('Y', "Unable to set the ACL of user `$user' in mailbox `$cyruid' to $acl, Error = `" . $cyrus->error . "'", KOLAB_WARN);
}
}
Kolab::log('Y', "Finished modifying ACL of $cyruid", KOLAB_DEBUG);
}
sub setFolderType {
my $cyrus = shift;
my $uid = shift;
my $sf = shift || 0;
my $foldertype = shift || 'mail';
my $cyruid = &createUid($uid, $sf);
if (!$cyrus->mboxconfig($cyruid, '/vendor/kolab/folder-type', $foldertype)) {
Kolab::log('Y', "Unable to set the folder type for mailbox `$cyruid' to `$foldertype', Error = `" . $cyrus->error . "'", KOLAB_WARN);
}
}
1;
__END__
# Below is stub documentation for your module. You'd better edit it!
=head1 NAME
Kolab::Cyrus - Perl extension for interfacing with the Kolab Cyrus
admin module.
=head1 ABSTRACT
Kolab::Cyrus contains cyrus-related functions, such as
adding/deleting mailboxes, etc.
=head1 COPYRIGHT AND AUTHORS
Stuart Bingë and others (see AUTHORS file)
=head1 LICENSE
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You can view the GNU General Public License, online, at the GNU
Project's homepage; see .
=cut
--- NEW FILE: LDAP.pm ---
package Kolab::LDAP;
## COPYRIGHT
## ---------
##
## See AUTHORS file
##
##
## LICENSE
## -------
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
## published by the Free Software Foundation; either version 2, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You can view the GNU General Public License, online, at the GNU
## Project's homepage; see .
##
## $Revision: 1.1 $
use 5.008;
use strict;
use warnings;
use UNIVERSAL;
use Time::Local;
use Net::LDAP qw( LDAP_SUCCESS LDAP_PROTOCOL_ERROR LDAP_REFERRAL );
use Net::LDAPS;
use Net::LDAP::Util;
use DB_File;
use Kolab;
use Kolab::Util;
use Kolab::Cyrus;
use vars qw(%uid_db %gyard_db %newuid_db %gyard_ts_db %quota_db);
require Exporter;
our @ISA = qw(Exporter);
our %EXPORT_TAGS = (
'all' => [ qw(
&startup
&shutdown
&create
&destroy
&ensureAsync
&isObject
&isDeleted
&createObject
&deleteObject
&sync
) ]
);
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw(
);
our $VERSION = '0.9';
# Timestamp to keep track of changed objects
our $user_timestamp = "";
our $sf_timestamp = "";
our $group_timestamp = "";
sub startup
{
my $statedir = shift;
Kolab::log('L', 'Starting up');
Kolab::log('L', 'Opening mailbox uid cache DB');
if (!dbmopen(%uid_db, "$statedir/mailbox-uidcache.db", 0666)) {
Kolab::log('L', 'Unable to open mailbox uid cache DB', KOLAB_ERROR);
exit(1);
}
Kolab::log('L', 'Opening graveyard uid/timestamp cache DB');
if (!dbmopen(%gyard_db, "$statedir/graveyard-uidcache.db", 0666)) {
Kolab::log('L', 'Unable to open graveyard uid cache DB', KOLAB_ERROR);
exit(1);
}
if (!dbmopen(%gyard_ts_db, "$statedir/graveyard-tscache.db", 0666)) {
Kolab::log('L', 'Unable to open graveyard timestamp cache DB', KOLAB_ERROR);
exit(1);
}
Kolab::log('L', 'Opening mailbox quota cache DB');
if (!dbmopen(%quota_db, "$statedir/mailbox-quotacache.db", 0666)) {
Kolab::log('L', 'Unable to open mailbox quota cache DB', KOLAB_ERROR);
exit(1);
}
}
sub shutdown
{
Kolab::log('L', 'Shutting down');
dbmclose(%uid_db);
dbmclose(%gyard_db);
dbmclose(%quota_db);
}
sub create
{
my $ip = shift;
my $pt = shift;
my $dn = shift;
my $pw = shift;
my $as = shift || 0;
Kolab::log('L', "Connecting to LDAP server `$ip:$pt'");
my $ldap;
if( $pt == 636 ) {
# Use SSL
$ldap = Net::LDAPS->new(
$ip,
port => $pt,
version => 3,
timeout => 20,
async => $as,
verify => 'none',
onerror => 'undef'
);
} else {
$ldap = Net::LDAP->new(
$ip,
port => $pt,
version => 3,
timeout => 20,
async => $as,
onerror => 'undef'
);
}
if (!$ldap) {
Kolab::log('L', "Unable to connect to LDAP server `$ip:$pt'", KOLAB_ERROR);
if ($as) { return 0; } else { exit(1); }
}
Kolab::log('L', "Binding to `$dn'");
my $ldapmesg = $ldap->bind(
$dn,
password => $pw
);
if ($ldapmesg->code) {
Kolab::log('L', "Unable to bind to `$dn', LDAP Error = `" . $ldapmesg->error . "'", KOLAB_ERROR);
if ($as) { return 0; } else { exit(1); }
}
return $ldap;
}
sub destroy
{
my $ldap = shift;
if (defined($ldap) && ($ldap->isa('Net::LDAP') || $ldap->isa('Net::LDAPS'))) {
$ldap->abandon;
$ldap->unbind;
$ldap->disconnect;
}
}
sub ensureAsync
{
my $ldap = shift || 0;
if ($ldap && !$ldap->async) {
Kolab::log('L', 'LDAP operations are not asynchronous', KOLAB_ERROR);
exit(1);
}
Kolab::log('L', 'LDAP operations are asynchronous', KOLAB_DEBUG);
}
sub isObject
{
my $object = shift;
my $class = shift;
my $classes = $object->get_value('objectClass', asref => 1);
return 0 if !defined($classes);
foreach my $oc (@$classes) {
if ($oc =~ /$class/i) {
return 1;
}
}
return 0;
}
sub isDeleted
{
my $object = shift;
my $p = shift || 'user';
my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1 );
#foreach (@$del) {
# return 1 if lc($_) eq lc($Kolab::config{'fqdnhostname'});
#}
#return 0;
return $#$del > 0;
}
# Map from Kolab ACLs to Cyrus ACLs
sub mapAcls {
my $acls = shift;
my $sf = shift || 0;
my @acls = map {
my ($uid,$perm) = split(/\s+/,$_,2);
Kolab::log('L', "Kolab::LDAP::mapAcls() uid=$uid perm=$perm", KOLAB_DEBUG);
my $post = 0;
if( $perm =~ /(.*)\/post/ ) {
$perm = $1;
$post = 1;
}
Kolab::log('L', "Kolab::LDAP::mapAcls() uid=$uid perm=$perm post=$post", KOLAB_DEBUG);
if( lc $perm eq 'none' ) { $_ = "$uid none"; }
elsif( lc $perm eq 'post' ) { $_ = "$uid p"; }
elsif( lc $perm eq 'read' ) { $_ = "$uid lrs"; }
elsif( lc $perm eq 'read anon' ) { $_ = "$uid lr"; }
elsif( lc $perm eq 'read hidden' ) { $_ = "$uid rs"; }
elsif( lc $perm eq 'append' ) { $_ = "$uid lrsip"; }
elsif( lc $perm eq 'write' ) { if( $sf ) { $_ = "$uid lrsiwdp"; } else { $_ = "$uid lrsiwcdp"; } }
elsif( lc $perm eq 'all' ) { if( $sf ) { $_ = "$uid lrsiwdap"; } else { $_ = "$uid lrsiwcdap"; } }
else { $_ = "$uid $perm"; } # passthrough
if( $post ) { $_ .= 'p'; }
Kolab::log('L', "Kolab::LDAP::mapAcls() acl=$_", KOLAB_DEBUG);
} @$acls;
if( $sf ) {
# Do we need to push admin rights for manager?
}
Kolab::log('L', "Kolab::LDAP::mapAcls() acls=".join(", ", @$acls), KOLAB_DEBUG);
return $acls;
}
sub createObject
{
my $ldap = shift;
my $cyrus = shift;
my $object = shift;
my $sync = shift || 0;
my $p = shift || 'user';
my $doacls = shift || 0;
my $objuidfield = shift || ($p eq 'user' ? 'mail' : ($p eq 'sf' ? 'cn' : ''));
Kolab::log('L', "Kolab::LDAP::createObject() called with obj uid field `$objuidfield' for obj type `$p'", KOLAB_DEBUG);
# No action for groups or external
return if( $objuidfield eq '' );
my $uid = lc(trim($object->get_value($objuidfield))) || 0;
return unless $uid;
return if( $objuidfield eq 'mail' && !$object->get_value('uid') );
my $kolabhomeserver = lc($object->get_value('kolabhomeserver'));
my $islocal = 1;
my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1);
if( ref($del) eq 'ARRAY' && @$del > 0 ) {
Kolab::log('L', "Kolab::LDAP::createObject() skipping object ".lc($object->get_value($objuidfield))
." because it is deleted", KOLAB_DEBUG);
return;
}
if( $kolabhomeserver && $kolabhomeserver ne lc($Kolab::config{'fqdnhostname'}) ) {
if( $p eq 'sf' ) {
# Dont create shared folders on other hosts than it's kolabhomeserver
Kolab::log('L', "Kolab::LDAP::createObject() skipping shared folder for other server $kolabhomeserver", KOLAB_DEBUG);
return;
}
Kolab::log('L', "Kolab::LDAP::createObject() for other server $kolabhomeserver. TODO: Create referral or something, for now we just create ", KOLAB_DEBUG);
$islocal = 0;
}
# Intermediate multidomain support:
# We accept domain encoded in CN...
if( $p eq 'sf' && index( $uid, '@' ) < 0 ) {
# We have to create shared folders
# with names shared.@
my @dcs = split(/,/,$object->dn());
my @dn;
while( pop( @dcs ) =~ /dc=(.*)/ ) {
push(@dn, $1);
}
if( $#dn > 0 ) { $uid .= '@'.join('.',reverse(@dn)); }
}
if (!$uid) {
Kolab::log('L', "Kolab::LDAP::createObject() called with null id attribute `$objuidfield', returning", KOLAB_DEBUG);
return;
}
Kolab::log('L', "Synchronising object `$uid'", KOLAB_DEBUG);
my $guid = $object->get_value($Kolab::config{$p . '_field_guid'});
Kolab::log('L', "GUID attribute `" . $Kolab::config{$p . '_field_guid'} . "' is `$guid'", KOLAB_DEBUG);
my $olduid = $uid_db{$guid} || '';
if ($olduid) {
# We have records of the object
$newuid_db{$guid} = $olduid if ($sync);
if ($olduid ne $uid) {
# The mailbox changed; bitch
Kolab::log('L', "Object `$uid' already exists as `$olduid'; refusing to create", KOLAB_WARN);
} else {
Kolab::log('L', "Object `$uid' already exists, skipping", KOLAB_DEBUG);
}
# Nothing changed; nothing to do
} else {
# No official records - check the graveyard
my $oldgyarduid = $gyard_db{$guid} || '';
if ($oldgyarduid) {
# The object needs to be resurrected!
if ($oldgyarduid ne $uid) {
Kolab::log('L', "Resurrected object `$uid' already exists as `$oldgyarduid'; refusing to create", KOLAB_WARN);
} else {
Kolab::log('L', "Object `$uid' has been resurrected", KOLAB_DEBUG);
}
# Remove the object from the graveyard
if ($sync) { $newuid_db{$guid} = $oldgyarduid; } else { $uid_db{$guid} = $oldgyarduid; }
delete $gyard_db{$guid};
delete $gyard_ts_db{$guid};
} else {
Kolab::log('L', "Creating user `$uid' corresponding to GUID `$guid'", KOLAB_DEBUG);
# We have a object that we have no previous record of, so create everything
if ($sync) { $newuid_db{$guid} = $uid; } else { $uid_db{$guid} = $uid; }
Kolab::Cyrus::createMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0));
if( $p eq 'sf' ){
my $foldertype = lc($object->get_value('kolabfoldertype'));
if ( $foldertype ne '' ){
Kolab::Cyrus::setFolderType($cyrus,$uid,1,$foldertype);
}
}
if( $p ne 'sf' && !$islocal ) {
# Hide user mailboxes on other servers
Kolab::Cyrus::setACL($cyrus,$uid,0, ["$uid rswipcda"]);
} elsif( $p ne 'sf' ) {
# Deal with group and resource accounts
my $edn = Net::LDAP::Util::ldap_explode_dn($object->dn(), casefold=>'lower' );
my $gcn = $edn->[1]->{'cn'};
if( $gcn && ($gcn eq 'groups' || $gcn eq 'resources') ) {
# We need to give the calendar user access to
# the groups/resources folder.
# TODO: Don't hardcode username
Kolab::log('L', "Detected group or resource account, adding ACL for calendar", KOLAB_ERROR );
Kolab::Cyrus::setACL($cyrus,$uid,0, ["$uid all",
'calendar@'.$Kolab::config{'postfix-mydomain'}
.' all']);
}
}
}
}
if ($doacls) {
my $acls = $object->get_value('acl', 'asref' => 1);
Kolab::Cyrus::setACL($cyrus, $uid, ($p eq 'sf' ? 1 : 0), mapAcls( $acls, ($p eq 'sf' ? 1:0)));
}
my $quota = $object->get_value($Kolab::config{$p . '_field_quota'});
defined($quota) or ($quota = 0);
my $oldquota = $quota_db{$guid} || 0;
if( $quota != $oldquota ) {
Kolab::Cyrus::setQuota($cyrus, $uid, $quota*1024, ($p eq 'sf' ? 1 : 0));
if( $quota == 0 ) {
delete $quota_db{$guid};
} else {
$quota_db{$guid} = $quota;
}
}
Kolab::log('L', "createObject() done", KOLAB_DEBUG );
}
sub createMasterLDAP {
my $uri = $Kolab::config{'ldap_master_uri'};
my $masterldap = Net::LDAP->new(
$uri,
version => 3,
timeout => 20,
verify => 'none',
onerror => 'undef' );
if( defined( $masterldap ) ) {
my $mesg = $masterldap->bind(
$Kolab::config{'bind_dn'},
password => $Kolab::config{'bind_pw'});
if ($mesg->code) {
Kolab::log('L', "Unable to bind to `$uri', LDAP Error = `"
.$mesg->error."'", KOLAB_ERROR);
undef( $masterldap );
}
} else {
Kolab::log('L', "Unable to connect to `$uri'"
, KOLAB_ERROR);
}
return $masterldap;
}
sub deleteObject
{
# This should only ever be called if the object is specifically flagged for
# deletion, as we nuke the mailbox
#
# The graveyard code will handle the case of an object `going missing'.
my $ldap = shift;
my $cyrus = shift;
my $object = shift;
my $remfromldap = shift || 0;
my $p = shift || 'user';
if ($remfromldap) {
my $dn = $object->dn;
my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1);
my $masterldap;
if( lc($Kolab::config{'is_master'}) eq 'true' ) {
# We are the master, just go ahead
$masterldap = $ldap;
} else {
$masterldap = createMasterLDAP;
}
if( !defined( $masterldap ) ) {
# Problem here, could not connect to master!
Kolab::log('L', "Unable to remove DN `$dn', master LDAP server not available", KOLAB_WARN);
return 0;
}
if( lc ($Kolab::config{'is_master'}) eq 'true' && ref($del) eq 'ARRAY' && scalar(@$del) == 1 ) {
# Ok we are the last one and the master
if( $Kolab::config{'kolab_remove_objectclass'} ) {
# Remove the kolab-related objectClasses
# Some people find it useful to integrate Kolab
# with an existing LDAP database and when a Kolab
# object is to be deleted, it should just remove
# the Kolab stuff and leave the rest of the object
# in the database.
#
# This is what we do here.
# Warning: All attributes in the kolab-related
# objectclasses will be deleted!
#
# PENDING(steffen): Only remove attributes that _have_ to
# be removed.
Kolab::log('L', "Removing Kolab objectClasses from DN `$dn'");
my $schema = $masterldap->schema( $dn );
# PENDING(steffen): Dont hardcode objectClasses
foreach my $c qw(kolabInetOrgPerson kolabGroupOfNames) {
my @may = map $_->{name}, $schema->may($c);
my @must = map $_->{name}, $schema->must($c);
foreach my $attr (@must, at may,split(' ',$Kolab::config{'kolab_remove_attributes'})) {
# Remove attributes
Kolab::log('L', "Removing attribute $attr", KOLAB_WARN);
my $mesg = $masterldap->modify( $dn,
delete => $attr );
if ($mesg && $mesg->code ) {
Kolab::log('L', "Unable to remove attribute $attr from DN `$dn': ".$mesg->error, KOLAB_WARN);
}
}
# Remove objectClass
my $mesg = $masterldap->modify( $dn,
delete => { 'objectClass' => $c } );
if ($mesg && $mesg->code ) {
Kolab::log('L', "Unable to remove Kolab objectClas $_ from DN `$dn': ".$mesg->error, KOLAB_WARN);
}
}
} else {
# Default behaviour, delete the object
Kolab::log('L', "Removing DN `$dn'");
my $mesg = $masterldap->delete($dn);
if ($mesg && $mesg->code ) {
Kolab::log('L', "Unable to remove DN `$dn': ".$mesg->error, KOLAB_WARN);
}
}
} elsif( lc ($Kolab::config{'is_master'}) eq 'false' ) {
# Just remove us from the kolabdeleteflag
# master does not perform this step as it should
# be the last to delete and remove the object
Kolab::log('L', "Removing ".$Kolab::config{'fqdnhostname'}." from ".
$Kolab::config{$p . '_field_deleted'}." in `$dn'");
my $mesg = $masterldap->modify( $dn, delete =>
{ $Kolab::config{$p . '_field_deleted'} =>
$Kolab::config{'fqdnhostname'} } );
if ($mesg && $mesg->code) {
Kolab::log('L', "Unable to remove ".$Kolab::config{'fqdnhostname'}
." from kolabdeleteflag in `$dn': ".$mesg->error, KOLAB_WARN);
}
}
if( $ldap != $masterldap ) {
# Disconnect from master if we are the slave
$masterldap->disconnect;
}
}
my $guid = $object->get_value($Kolab::config{$p . '_field_guid'});
my $uid = $uid_db{$guid} || 0;
if (!$uid) {
Kolab::log('L', 'Deleted object not found in mboxcache, returning', KOLAB_DEBUG);
return;
}
Kolab::Cyrus::deleteMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0));
delete $uid_db{$guid};
delete $quota_db{$guid};
return 1;
}
sub sync
{
Kolab::log('L', 'Synchronising');
my $cyrus = Kolab::Cyrus::create;
if( !$cyrus ) {
# We could not connect, bail out for now
return 0;
}
%newuid_db = ();
$user_timestamp = syncBasic($cyrus, 'user', '', $user_timestamp, 0);
$sf_timestamp = syncBasic($cyrus, 'sf', '', $sf_timestamp, 1);
$group_timestamp = syncBasic($cyrus, 'group', '', $group_timestamp, 0);
# Check that all mailboxes correspond to LDAP objects
Kolab::log('L', 'Synchronising mailboxes');
my @mailboxes = $cyrus->list('*');
my %objects;
my $mailbox;
foreach $mailbox (@mailboxes) {
my $u = ${@{$mailbox}}[0];
$u =~ /user[\/\.]([^\/]*)\/?.*/;
$objects{$1} = 1 if ($1);
}
undef @mailboxes;
my $guid;
foreach $guid (keys %newuid_db) {
delete $objects{$newuid_db{$guid}} if (exists $objects{$newuid_db{$guid}});
}
# Any mailboxes left should be sent to the graveyard; these are mailboxes
# without a corresponding LDAP object, yet we were never informed of their
# deletion, i.e. either we missed the deletion notification or there was
# an error when iterating through the objects (Lost connection, invalid DNs)
foreach $guid (keys %uid_db) {
if (defined $uid_db{$guid} && exists $objects{$uid_db{$guid}}) {
$gyard_db{$guid} = $uid_db{$guid};
$gyard_ts_db{$guid} = time;
}
}
my $now = time;
my $period = $Kolab::config{'gyard_deletion_period'} * 60;
Kolab::log('L', 'Gravekeeping (period = ' . $Kolab::config{'gyard_deletion_period'} . ' minutes)');
foreach $guid (keys %gyard_ts_db) {
if ($now - $gyard_ts_db{$guid} > $period) {
Kolab::log('L', "Clearing graveyard database entry `" . $gyard_db{$guid} . "'");
#Kolab::Cyrus::deleteMailbox($cyrus, $gyard_db{$guid}, 0);
delete $gyard_ts_db{$guid};
delete $gyard_db{$guid};
}
}
%uid_db = %newuid_db;
Kolab::log('L', 'Finished synchronisation');
}
# Date::Parse doesn't understand this format
# so we have to hack it ourselves
sub parse_generalized_time
{
my $ts = shift;
# YYYYMMDDHHMMSSZ
if( $ts =~ /(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)Z/ ) {
my $t = 0;
eval { $t = timegm($6,$5,$4,$3,$2-1,$1); };
return $t;
} else {
return 0;
}
}
# Returns the largest of two string-rep.
# of LDAP generalizedTime
sub max_generalized_time
{
my $ts1 = shift;
my $ts2 = shift;
if( parse_generalized_time($ts1) >
parse_generalized_time($ts2) ) { return $ts1; }
else { return $ts2; }
}
sub syncBasic
{
my $cyrus = shift;
my $p = shift || 'user';
my $add = shift || ($p eq 'user' ? '' : '');
my $ts = shift || "";
my $doacls = shift || 0;
Kolab::log('L', "Synchronising `$p' objects");
my $ldap = &create(
$Kolab::config{$p . '_ldap_ip'},
$Kolab::config{$p . '_ldap_port'},
$Kolab::config{$p . '_bind_dn'},
$Kolab::config{$p . '_bind_pw'}
);
my $ldapmesg;
my $ldapobject;
my @dnlist = split(/;/, $Kolab::config{$p . '_dn_list'});
my $dn;
foreach $dn (@dnlist) {
Kolab::log('L', "Synchronising `$p' DN `$dn'");
# First of all, remove any objects explicitly marked for deletion
$ldapmesg = $ldap->search(
base => $dn,
scope => 'sub',
filter => '(&(objectClass=' . $Kolab::config{$p . '_object_class'} . ")$add(" . $Kolab::config{$p . '_field_deleted'} . '='.$Kolab::config{'fqdnhostname'}.'))',
attrs => [
'objectClass',
$Kolab::config{$p . '_field_guid'},
$Kolab::config{$p . '_field_modified'},
$Kolab::config{$p . '_field_deleted'},
],
);
if ( UNIVERSAL::isa( $ldapmesg, 'Net::LDAP::Search') && $ldapmesg->code() <= 0) {
while( $ldapobject = $ldapmesg->pop_entry ) {
deleteObject($ldap, $cyrus, $ldapobject, 1, $p);
}
} else {
Kolab::log('L', "Unable to locate deleted `$p' objects in DN `$dn'", KOLAB_WARN);
}
# Now check that all objects in LDAP have corresponding mailboxes
# This also resurrects any missing users, if neccessary
my $filter;
if( $ts eq "" ) {
$filter = '(&(objectClass=' . $Kolab::config{$p . '_object_class'} . ")$add)",
} else {
$filter = '(&(objectClass=' . $Kolab::config{$p . '_object_class'} . ")("
.$Kolab::config{$p.'_field_modified'}.">=$ts)$add)";
}
Kolab::log('L', "filter is $filter", KOLAB_DEBUG);
$ldapmesg = $ldap->search(
base => $dn,
scope => 'sub',
filter => $filter,
attrs => [
'*',
$Kolab::config{$p . '_field_guid'},
$Kolab::config{$p . '_field_modified'},
$Kolab::config{$p . '_field_quota'},
$Kolab::config{$p . '_field_deleted'},
],
);
if ( UNIVERSAL::isa( $ldapmesg, 'Net::LDAP::Search') && $ldapmesg->code() <= 0) {
while( $ldapobject = $ldapmesg->pop_entry ) {
createObject($ldap, $cyrus, $ldapobject, 1, $p, $doacls);
$ts = max_generalized_time($ts,$ldapobject->get_value($Kolab::config{$p . '_field_modified'}));
}
} else {
Kolab::log('L', "Unable to locate `$p' objects in DN `$dn'", KOLAB_WARN);
}
Kolab::log('L', "Finished synchronising `$p' DN `$dn'");
}
&destroy($ldap);
Kolab::log('L', "Finished `$p' object synchronisation");
return $ts;
}
1;
__END__
# Below is stub documentation for your module. You'd better edit it!
=head1 NAME
Kolab::LDAP - Perl extension for generic LDAP code
=head1 ABSTRACT
Kolab::LDAP contains functions used to create/delete objects,
as well as synchronise LDAP and Cyrus.
=head1 COPYRIGHT AND AUTHORS
Stuart Bingë and others (see AUTHORS file)
=head1 LICENSE
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You can view the GNU General Public License, online, at the GNU
Project's homepage; see .
=cut
--- NEW FILE: Util.pm ---
package Kolab::Util;
## COPYRIGHT
## ---------
##
## See AUTHORS file
##
##
## LICENSE
## -------
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
## published by the Free Software Foundation; either version 2, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You can view the GNU General Public License, online, at the GNU
## Project's homepage; see .
##
## $Revision: 1.1 $
use 5.008;
use strict;
use warnings;
use IO::File;
use Sys::Syslog;
require Exporter;
our @ISA = qw(Exporter);
our %EXPORT_TAGS = (
'all' => [ qw(
) ]
);
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw(
&trim
&ldapDateToEpoch
&readConfig
&readList
&superLog
);
our $VERSION = '0.9';
sub trim
{
my $string = shift;
if (defined $string) {
$string =~ s/^\s+//g;
$string =~ s/\s+$//g;
chomp $string;
}
return $string;
}
sub ldapDateToEpoch
{
my $ldapdate = shift;
(my $y, my $m, my $d, my $h, my $mi, my $se) = unpack('A4A2A2A2A2A2', $ldapdate);
return timelocal($se, $mi, $h, $d, $m, $y);
}
sub superLog
{
my $text = shift;
#print STDERR "$text\n";
syslog('info', "$text");
}
sub readConfig
{
my $ref = shift;
my (%cfg, $file);
if (ref($ref) eq 'HASH') {
%cfg = %$ref;
$file = shift || 0;
} else {
$file = $ref;
}
if (!$file) { return %cfg; }
my $sep = shift || ':';
$sep = '\s' if ($sep eq ' ' || $sep eq '#');
my $fd;
if (!($fd = IO::File->new($file, 'r'))) {
superLog( "Warning: Could not read $file");
return %cfg;
}
foreach (<$fd>) {
if (/^([^$sep#]+)$sep(.*)/) {
$cfg{trim($1)} = trim($2);
}
}
return %cfg;
}
sub readList
{
my @list;
my $file = shift || 0;
if (!$file) { return @list; }
my $fd;
if (!($fd = IO::File->new($file, 'r'))) { return @list; }
foreach (<$fd>) {
if (/^([^#]+)/) {
my $temp = trim($1);
next if $temp eq '';
push(@list, ($temp));
}
}
return @list;
}
1;
__END__
# Below is stub documentation for your module. You'd better edit it!
=head1 NAME
Kolab::Util - Perl extension for general utility functions
=head1 ABSTRACT
Kolab::Util contains several basic utility functions.
=head1 COPYRIGHT AND AUTHORS
Stuart Bingë and others (see AUTHORS file)
=head1 LICENSE
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You can view the GNU General Public License, online, at the GNU
Project's homepage; see .
=cut
From cvs at kolab.org Wed Aug 1 16:57:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:43 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend-ad/t 1.t,1.1,NONE
Message-ID: <20070801145743.EDD3760AE50@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-ad/t
In directory doto:/tmp/cvs-serv20643/Kolab-LDAP-Backend-ad/t
Removed Files:
1.t
Log Message:
Converted the perl-kolab package into a standard perl library.
--- 1.t DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:44 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Util/t 1.t,1.1,NONE
Message-ID: <20070801145744.066FC60AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Util/t
In directory doto:/tmp/cvs-serv20643/Kolab-Util/t
Removed Files:
1.t
Log Message:
Converted the perl-kolab package into a standard perl library.
--- 1.t DELETED ---
From cvs at kolab.org Wed Aug 1 16:57:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:44 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib/Kolab/LDAP/Backend ad.pm, NONE,
1.1 slurpd.pm, NONE, 1.1
Message-ID: <20070801145744.1ED3160AE59@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend
In directory doto:/tmp/cvs-serv20643/lib/Kolab/LDAP/Backend
Added Files:
ad.pm slurpd.pm
Log Message:
Converted the perl-kolab package into a standard perl library.
--- NEW FILE: ad.pm ---
package Kolab::LDAP::Backend::ad;
## COPYRIGHT
## ---------
##
## See AUTHORS file
##
##
## LICENSE
## -------
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
## published by the Free Software Foundation; either version 2, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You can view the GNU General Public License, online, at the GNU
## Project's homepage; see .
##
## $Revision: 1.1 $
use 5.008;
use strict;
use warnings;
use Kolab;
use Kolab::Util;
use Kolab::LDAP;
use Net::LDAP;
use Net::LDAP::Control;
use vars qw($ldap $cyrus);
require Exporter;
our @ISA = qw(Exporter);
our %EXPORT_TAGS = (
'all' => [ qw(
&startup
&run
) ]
);
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw(
);
our $VERSION = '0.9';
sub startup { 1; }
sub shutdown
{
Kolab::log('AD', 'Shutting down');
exit(0);
}
sub abort
{
Kolab::log('AD', 'Aborting');
exit(1);
}
sub changeCallback
{
Kolab::log('AD', 'Change notification received', KOLAB_DEBUG);
### $_[0] isa Net::LDAP::Message
### $_[1] shouldbea Net::LDAP::Entry
my $mesg = shift || 0;
my $entry = shift || 0;
my $issearch = $mesg->isa("Net::LDAP::Search");
if (!$issearch) {
Kolab::log('AD', 'mesg is not a search object, testing code...', KOLAB_DEBUG);
if ($mesg->code == 88) {
Kolab::log('AD', 'changeCallback() -> Exit code received, returning', KOLAB_DEBUG);
return;
} elsif ($mesg->code) {
Kolab::log('AD', "mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
&abort;
}
} else {
Kolab::log('AD', 'mesg is a search object, not testing code', KOLAB_DEBUG);
}
if (!$entry) {
Kolab::log('AD', 'changeCallback() called with a null entry', KOLAB_DEBUG);
return;
} elsif (!$entry->isa("Net::LDAP::Entry")) {
Kolab::log('AD', 'changeCallback() called with an invalid entry', KOLAB_DEBUG);
return;
}
if (!Kolab::LDAP::isObject($entry, $Kolab::config{'user_object_class'})) {
Kolab::log('AD', "Entry is not a `" . $Kolab::config{'user_object_class'} . "', returning", KOLAB_DEBUG);
return;
}
my $deleted = $entry->get_value($Kolab::config{'user_field_deleted'}) || 0;
if ($deleted) {
Kolab::LDAP::deleteObject($ldap, $cyrus, $entry);
return;
}
Kolab::LDAP::createObject($ldap, $cyrus, $entry);
}
sub run
{
# This should be called from a separate thread, as we set our
# own interrupt handlers here
$SIG{'INT'} = \&shutdown;
$SIG{'TERM'} = \&shutdown;
END {
alarm 0;
Kolab::LDAP::destroy($ldap);
}
my $mesg;
Kolab::log('AD', 'Listener starting up');
$cyrus = Kolab::Cyrus::create;
Kolab::log('AD', 'Cyrus connection established', KOLAB_DEBUG);
while (1) {
Kolab::log('AD', 'Creating LDAP connection to AD server', KOLAB_DEBUG);
$ldap = Kolab::LDAP::create(
$Kolab::config{'user_ldap_ip'},
$Kolab::config{'user_ldap_port'},
$Kolab::config{'user_bind_dn'},
$Kolab::config{'user_bind_pw'},
1
);
if (!$ldap) {
Kolab::log('AD', 'Sleeping 5 seconds...');
sleep 5;
next;
}
Kolab::log('AD', 'LDAP connection established', KOLAB_DEBUG);
Kolab::LDAP::ensureAsync($ldap);
Kolab::log('AD', 'Async checked', KOLAB_DEBUG);
my $ctrl = Net::LDAP::Control->new(
type => '1.2.840.113556.1.4.528',
critical => 'true'
);
Kolab::log('AD', 'Control created', KOLAB_DEBUG);
my @userdns = split(/;/, $Kolab::config{'user_dn_list'});
my $userdn;
Kolab::log('AD', 'User DN list = ' . $Kolab::config{'user_dn_list'}, KOLAB_DEBUG);
if (length(@userdns) == 0) {
Kolab::log('AD', 'No user DNs specified, exiting', KOLAB_ERROR);
exit(1);
}
foreach $userdn (@userdns) {
Kolab::log('AD', "Registering change notification on DN `$userdn'");
$mesg = $ldap->search (
base => $userdn,
scope => 'one',
control => [ $ctrl ],
callback => \&changeCallback,
filter => '(objectClass=*)',
attrs => [
'*',
$Kolab::config{'user_field_guid'},
$Kolab::config{'user_field_modified'},
$Kolab::config{'user_field_quota'},
$Kolab::config{'user_field_deleted'},
],
);
Kolab::log('AD', "Change notification registered on `$userdn'");
}
eval {
local $SIG{ALRM} = sub {
alarm 0;
Kolab::log('AD', 'Connection refresh period expired; tearing down connection');
Kolab::LDAP::destroy($ldap);
next;
};
Kolab::log('AD', 'Waiting for changes (refresh period = ' . $Kolab::config{'conn_refresh_period'} . ' minutes)...');
alarm $Kolab::config{'conn_refresh_period'} * 60;
$mesg->sync;
alarm 0;
};
}
1;
}
1;
__END__
# Below is stub documentation for your module. You'd better edit it!
=head1 NAME
Kolab::LDAP::Backend::ad - Perl extension for an Active Directory backend
=head1 ABSTRACT
Kolab::LDAP::Backend::ad handles an Active Directory backend to the
kolab daemon.
=head1 COPYRIGHT AND AUTHORS
Stuart Bingë and others (see AUTHORS file)
=head1 LICENSE
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You can view the GNU General Public License, online, at the GNU
Project's homepage; see .
=cut
--- NEW FILE: slurpd.pm ---
package Kolab::LDAP::Backend::slurpd;
## COPYRIGHT
## ---------
##
## See AUTHORS file
##
##
## LICENSE
## -------
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
## published by the Free Software Foundation; either version 2, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You can view the GNU General Public License, online, at the GNU
## Project's homepage; see .
##
## $Revision: 1.1 $
use 5.008;
use strict;
use warnings;
use IO::Select;
use IO::Socket::INET;
use Convert::ASN1 qw(:io);
use Net::LDAP;
use Net::LDAP::Constant qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR);
use Net::LDAP::ASN qw(LDAPRequest LDAPResponse LDAPResult);
use Kolab;
use Kolab::Util;
use Kolab::LDAP;
use vars qw($conn $server);
require Exporter;
our @ISA = qw(Exporter);
our %EXPORT_TAGS = (
'all' => [ qw(
&startup
&run
) ]
);
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw(
);
our $VERSION = '0.9';
sub startup { 1; }
sub shutdown
{
Kolab::log('SD', 'Shutting down');
exit(0);
}
sub abort
{
Kolab::log('SD', 'Aborting');
exit(1);
}
sub PROTOCOLOP_BINDREQUEST () { 0x00 }
sub PROTOCOLOP_BINDRESPONSE () { 0x01 }
sub PROTOCOLOP_UNBINDREQUEST () { 0x02 }
sub PROTOCOLOP_SEARCHREQUEST () { 0x03 }
sub PROTOCOLOP_SEARCHRESENTRY () { 0x04 }
sub PROTOCOLOP_SEARCHRESDONE () { 0x05 }
sub PROTOCOLOP_SEARCHRESREF () { 0x06 }
sub PROTOCOLOP_MODIFYREQUEST () { 0x07 }
sub PROTOCOLOP_MODIFYRESPONSE () { 0x08 }
sub PROTOCOLOP_ADDREQUEST () { 0x09 }
sub PROTOCOLOP_ADDRESPONSE () { 0x10 }
sub PROTOCOLOP_DELREQUEST () { 0x11 }
sub PROTOCOLOP_DELRESPONSE () { 0x12 }
sub PROTOCOLOP_MODDNREQUEST () { 0x13 }
sub PROTOCOLOP_MODDNRESPONSE () { 0x14 }
sub PROTOCOLOP_COMPAREREQUEST () { 0x15 }
sub PROTOCOLOP_COMPARERESPONSE () { 0x16 }
sub PROTOCOLOP_ABANDONREQUEST () { 0x17 }
sub PROTOCOLOP_EXTENDEDREQ () { 0x18 }
sub PROTOCOLOP_EXTENDEDRESP () { 0x19 }
sub getRequestType
{
my $op = shift;
if ($op->{bindRequest}) { return "bindRequest"; }
if ($op->{unbindRequest}) { return "unbindRequest"; }
if ($op->{addRequest}) { return "addRequest"; }
if ($op->{delRequest}) { return "delRequest"; }
if ($op->{modifyRequest}) { return "modifyRequest"; }
if ($op->{modDNRequest}) { return "modDNRequest"; }
if ($op->{searchRequest}) { return "searchRequest"; }
if ($op->{compareRequest}) { return "compareRequest"; }
if ($op->{abandonRequest}) { return "abandonRequest"; }
if ($op->{extendedRequest}) { return "extendedRequest"; }
return "";
}
sub responseBind
{
my $req = shift;
my $pdu = $LDAPResponse->encode(
messageID => $req->{messageID},
protocolOp => {
choiceID => PROTOCOLOP_BINDRESPONSE,
bindResponse => {
resultCode => LDAP_SUCCESS,
matchedDN => $req->{bindRequest}{name},
errorMessage => "",
serverSaslCreds => ""
}
}
);
if (!$pdu) {
Kolab::log('SD', "LDAPResponse error `" . $LDAPResponse->error . "'");
&abort;
}
return $pdu;
}
sub responseAdd
{
my $req = shift;
my $pdu = $LDAPResponse->encode(
messageID => $req->{messageID},
protocolOp => {
choiceID => PROTOCOLOP_ADDRESPONSE,
addResponse => {
resultCode => LDAP_SUCCESS,
matchedDN => $req->{addRequest}{objectName},
errorMessage => ""
}
}
);
if (!$pdu) {
Kolab::log('SD', "LDAPResponse error `" . $LDAPResponse->error . "'");
&abort;
}
return $pdu;
}
sub responseDel
{
my $req = shift;
my $pdu = $LDAPResponse->encode(
messageID => $req->{messageID},
protocolOp => {
choiceID => PROTOCOLOP_DELRESPONSE,
addResponse => {
resultCode => LDAP_SUCCESS,
matchedDN => $req->{delRequest},
errorMessage => ""
}
}
);
if (!$pdu) {
Kolab::log('SD', "LDAPResponse error `" . $LDAPResponse->error . "'");
&abort;
}
return $pdu;
}
sub responseMod
{
my $req = shift;
my $pdu = $LDAPResponse->encode(
messageID => $req->{messageID},
protocolOp => {
choiceID => PROTOCOLOP_MODIFYRESPONSE,
addResponse => {
resultCode => LDAP_SUCCESS,
matchedDN => $req->{modifyRequest}{object},
errorMessage => ""
}
}
);
if (!$pdu) {
Kolab::log('SD', "LDAPResponse error `" . $LDAPResponse->error . "'");
&abort;
}
return $pdu;
}
sub responseModDN
{
my $req = shift;
my $pdu = $LDAPResponse->encode(
messageID => $req->{messageID},
protocolOp => {
choiceID => PROTOCOLOP_MODDNRESPONSE,
addResponse => {
resultCode => LDAP_SUCCESS,
matchedDN => $req->{modDNRequest}{entry},
errorMessage => ""
}
}
);
if (!$pdu) {
Kolab::log('SD', "LDAPResponse error `" . $LDAPResponse->error . "'");
&abort;
}
return $pdu;
}
sub run
{
# This should be called from a separate thread, as we set our
# own interrupt handlers here
$SIG{'INT'} = \&shutdown;
$SIG{'TERM'} = \&shutdown;
END {
if ($conn) { $conn->close; }
if ($server) { $server->close; }
}
my $request;
my $response;
my $pdu;
my $changes = 0;
my $listenport = $Kolab::config{'slurpd_port'};
my $listenaddr = $Kolab::config{'slurpd_addr'} || "127.0.0.1";
TRYCONNECT:
Kolab::log('SD', "Opening listen server on $listenaddr:$listenport");
$server = IO::Socket::INET->new(
LocalPort => $listenport,
Proto => "tcp",
ReuseAddr => 1,
Type => SOCK_STREAM,
LocalAddr => $listenaddr,
Listen => 10
);
if (!$server) {
Kolab::log('SD', "Unable to open TCP listen server on $listenaddr:$listenport, Error = $@", KOLAB_ERROR);
sleep 1;
goto TRYCONNECT;
}
Kolab::log('SD', 'Listen server opened, waiting for incoming connections');
while ($conn = $server->accept()) {
# PENDING: Only accept connections from localhost and
# hosts listed in the kolabhost attribute
my($peerport, $peeraddr) = sockaddr_in($conn->peername);
$peeraddr = inet_ntoa( $peeraddr );
Kolab::log('SD', "Incoming connection accepted, peer=$peeraddr");
if( $Kolab::config{'slurpd_accept_addr'} && $peeraddr ne $Kolab::config{'slurpd_accept_addr'} ) {
Kolab::log('SD', "Unauthorized connection from $peeraddr, closing connection", KOLAB_WARN);
$conn->close;
undef $conn;
next;
}
my $select = IO::Select->new($conn);
while ($conn) {
undef $pdu;
my $ready;
my $offset = 0;
if (!($select->can_read(0)) && $changes) {
Kolab::log('SD', 'Change detected w/ no pending LDAP messages; waiting a second...');
if( !($select->can_read(1)) ) {
$changes = 0;
Kolab::log('SD', 'Change detected w/ no pending LDAP messages; reloading services if needed');
Kolab::LDAP::sync;
Kolab::log('SD', "Running $Kolab::config{'kolabconf_script'}");
system($Kolab::config{'kolabconf_script'}) == 0
or Kolab::log('SD', "Failed to run $Kolab::config{'kolabconf_script'}: $?", KOLAB_ERROR);
Kolab::log('SD', "$Kolab::config{'kolabconf_script'} complete");
}
}
Kolab::log('SD', 'Waiting for LDAP updates');
for ($ready = 1; $conn && $ready; $ready = $select->can_read(0)) {
Kolab::log('SD', 'Reading ASN', KOLAB_DEBUG);
my $newoffset = asn_read($conn, $pdu, $offset);
if( !$conn->connected() or $offset == $newoffset ) {
Kolab::log('SD', 'Connection closed', KOLAB_DEBUG);
$conn->close;
undef $conn;
}
$offset = $newoffset;
defined($offset) or $offset = 0;
}
if ($pdu) {
$request = $LDAPRequest->decode($pdu);
if (!$request) {
Kolab::log('SD', "Unable to decode slurpd request, Error = `" . $LDAPRequest->error . "'", KOLAB_ERROR);
$conn->close if $conn;
undef $conn;
undef $pdu;
} else {
$_ = getRequestType($request);
Kolab::log('SD', "Request $_ received", KOLAB_DEBUG);
undef $pdu;
SWITCH: {
if (/^bindRequest/) { $pdu = responseBind($request); last SWITCH; }
if (/addRequest/) { $pdu = responseAdd($request); $changes = 1; last SWITCH; }
if (/delRequest/) { $pdu = responseDel($request); $changes = 1; last SWITCH; }
if (/modifyRequest/) { $pdu = responseMod($request); $changes = 1; last SWITCH; }
if (/modDNRequest/) { $pdu = responseModDN($request); $changes = 1; last SWITCH; }
if( $conn ) {
Kolab::log('SD', 'Unknown request, connection closed', KOLAB_DEBUG);
$conn->close;
undef $conn;
}
}
}
}
if ($pdu) {
Kolab::log('SD', 'Writing response', KOLAB_DEBUG);
syswrite($conn, $pdu, length($pdu));
$response = $LDAPResponse->decode($pdu);
if (!$response) {
Kolab::log('SD', "Unable to decode slurpd request, Error = `" . $LDAPRequest->error . "'");
$conn->close;
undef $conn;
}
}
}
}
$server->close;
1;
}
1;
__END__
# Below is stub documentation for your module. You'd better edit it!
=head1 NAME
Kolab::LDAP::Backend::slurpd - Perl extension for a slurpd backend
=head1 ABSTRACT
Kolab::LDAP::Backend::slurpd handles a slurpd backend to the
kolab daemon.
=head1 COPYRIGHT AND AUTHORS
Stuart Bingë and others (see AUTHORS file)
=head1 LICENSE
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You can view the GNU General Public License, online, at the GNU
Project's homepage; see .
=cut
From cvs at kolab.org Wed Aug 1 16:57:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:57:44 +0200 (CEST)
Subject: gunnar: server/perl-kolab/lib/Kolab/LDAP Backend.pm,NONE,1.1
Message-ID: <20070801145744.1B6CB60AE50@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/lib/Kolab/LDAP
In directory doto:/tmp/cvs-serv20643/lib/Kolab/LDAP
Added Files:
Backend.pm
Log Message:
Converted the perl-kolab package into a standard perl library.
--- NEW FILE: Backend.pm ---
package Kolab::LDAP::Backend;
## COPYRIGHT
## ---------
##
## See AUTHORS file
##
##
## LICENSE
## -------
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
## published by the Free Software Foundation; either version 2, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You can view the GNU General Public License, online, at the GNU
## Project's homepage; see .
##
## $Revision: 1.1 $
use 5.008;
use strict;
use warnings;
use Kolab;
use Kolab::Util;
use vars qw(
%startup
%run
%backends
);
require Exporter;
our @ISA = qw(Exporter);
our %EXPORT_TAGS = (
'all' => [ qw(
&load
&startup
&run
%backends
) ]
);
our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
our @EXPORT = qw(
);
our $VERSION = '0.9';
sub load
{
my $p = shift || '';
my $non_directory = shift;
my $backend;
if (!defined $non_directory) {
$p .= '_' if ($p);
$backend = $Kolab::config{$p . 'directory_mode'};
} else {
$backend = $p;
}
return if (exists($backends{$backend}));
Kolab::log('B', "Loading backend `$backend'");
unless (eval "require Kolab::LDAP::Backend::$backend") {
Kolab::log('B', "Error is: $@", KOLAB_ERROR) if $@;
Kolab::log('B', "Backend `$backend' does not exist or has errors, exiting", KOLAB_ERROR);
exit(1);
}
$startup{$backend} = \&{'Kolab::LDAP::Backend::' . $backend . '::startup'};
$run{$backend} = \&{'Kolab::LDAP::Backend::' . $backend . '::run'};
$backends{$backend} = 1;
}
# shutdown is handled per-module, using signals
sub startup
{
foreach my $backend (keys %backends) {
my $func = $startup{$backend};
unless (eval '&$func') {
$func = 'Kolab::LDAP::Backend::' . $backend . '::startup';
Kolab::log('B', "Error in function `$func': $@, exiting", KOLAB_ERROR);
exit(1);
}
}
}
sub run
{
my $backend = shift || 1;
return if (!exists($run{$backend}));
my $func = $run{$backend};
unless (eval '&$func') {
$func = 'Kolab::LDAP::Backend::' . $backend . '::run';
Kolab::log('B', "Error in function `$func': $@, exiting", KOLAB_ERROR);
exit(1);
}
}
1;
__END__
# Below is stub documentation for your module. You'd better edit it!
=head1 NAME
Kolab::LDAP::Backend - Perl extension for abstract directory
service usage
=head1 ABSTRACT
Kolab::LDAP::Backend is basically an interface to the various
directory service backends that are available.
=head1 COPYRIGHT AND AUTHORS
Stuart Bingë and others (see AUTHORS file)
=head1 LICENSE
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You can view the GNU General Public License, online, at the GNU
Project's homepage; see .
=cut
From cvs at kolab.org Wed Aug 1 16:58:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:58:48 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab README,1.1,NONE
Message-ID: <20070801145848.2F70360AE65@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab
In directory doto:/tmp/cvs-serv21043/Kolab
Removed Files:
README
Log Message:
Removed obsolete README files.
--- README DELETED ---
From cvs at kolab.org Wed Aug 1 16:58:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:58:48 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Conf README,1.1,NONE
Message-ID: <20070801145848.302C160AE68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv21043/Kolab-Conf
Removed Files:
README
Log Message:
Removed obsolete README files.
--- README DELETED ---
From cvs at kolab.org Wed Aug 1 16:58:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:58:48 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP README,1.1,NONE
Message-ID: <20070801145848.3669E60AE6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP
In directory doto:/tmp/cvs-serv21043/Kolab-LDAP
Removed Files:
README
Log Message:
Removed obsolete README files.
--- README DELETED ---
From cvs at kolab.org Wed Aug 1 16:58:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:58:48 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Cyrus README,1.1,NONE
Message-ID: <20070801145848.317CF60AE69@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Cyrus
In directory doto:/tmp/cvs-serv21043/Kolab-Cyrus
Removed Files:
README
Log Message:
Removed obsolete README files.
--- README DELETED ---
From cvs at kolab.org Wed Aug 1 16:58:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:58:48 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend README,1.1,NONE
Message-ID: <20070801145848.3DF1B60AE6B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend
In directory doto:/tmp/cvs-serv21043/Kolab-LDAP-Backend
Removed Files:
README
Log Message:
Removed obsolete README files.
--- README DELETED ---
From cvs at kolab.org Wed Aug 1 16:58:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:58:48 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend-slurpd README,1.1,NONE
Message-ID: <20070801145848.49BF460AE65@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd
In directory doto:/tmp/cvs-serv21043/Kolab-LDAP-Backend-slurpd
Removed Files:
README
Log Message:
Removed obsolete README files.
--- README DELETED ---
From cvs at kolab.org Wed Aug 1 16:58:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:58:48 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-Util README,1.1,NONE
Message-ID: <20070801145848.5699760AE68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-Util
In directory doto:/tmp/cvs-serv21043/Kolab-Util
Removed Files:
README
Log Message:
Removed obsolete README files.
--- README DELETED ---
From cvs at kolab.org Wed Aug 1 16:58:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 16:58:48 +0200 (CEST)
Subject: gunnar: server/perl-kolab/Kolab-LDAP-Backend-ad README,1.1,NONE
Message-ID: <20070801145848.3EF2860AE6C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-ad
In directory doto:/tmp/cvs-serv21043/Kolab-LDAP-Backend-ad
Removed Files:
README
Log Message:
Removed obsolete README files.
--- README DELETED ---
From cvs at kolab.org Wed Aug 1 17:03:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 17:03:48 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.106, 1.107 Makefile.am, 1.29,
1.30 kolab.globals.in, 1.2, 1.3 kolabconf.in, 1.3, NONE
Message-ID: <20070801150348.AC8C560AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv22290
Modified Files:
ChangeLog Makefile.am kolab.globals.in
Removed Files:
kolabconf.in
Log Message:
Removed kolabconf from the kolabd package into its own package.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- ChangeLog 31 Jul 2007 11:54:33 -0000 1.106
+++ ChangeLog 1 Aug 2007 15:03:46 -0000 1.107
@@ -1,3 +1,13 @@
+2007-08-01 Gunnar Wrobel
+
+ * Makefile.am:
+ * kolabd/kolabconf.in:
+ * kolab.globals.in :
+
+ Moved kolabconf in its own package and modified the global
+ configuration file so that it provides all necessary configuration
+ for the kolabconf script.
+
2007-07-31 Gunnar Wrobel
* kolab.globals.in (kolab_locals):
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile.am 27 Jul 2007 20:28:31 -0000 1.29
+++ Makefile.am 1 Aug 2007 15:03:46 -0000 1.30
@@ -144,11 +144,9 @@
if OPENPKG
kolabsbin_FILES = kolabd \
- kolabconf \
kolabcheckperm
else
kolabsbin_FILES = kolabd \
- kolabconf \
kolabcheckperm \
dist_conf/kolabsrv
endif
@@ -206,13 +204,6 @@
CLEANFILES += kolab_sslcert.sh
EXTRA_DIST += kolab_sslcert.sh.in
-kolabconf: kolabconf.in
- @$(mkinstalldirs) .
- $(do_subst) <$(srcdir)/kolabconf.in >$@
- chmod a+x kolabconf
-CLEANFILES += kolabconf
-EXTRA_DIST += kolabconf.in
-
kolabcheckperm: kolabcheckperm.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabcheckperm.in >$@
@@ -583,7 +574,6 @@
chmod 600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
chmod 744 $(DESTDIR)$(sbindir)/kolabd
- chmod 744 $(DESTDIR)$(sbindir)/kolabconf
chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
if ! OPENPKG
Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.globals.in 31 Jul 2007 11:54:33 -0000 1.2
+++ kolab.globals.in 1 Aug 2007 15:03:46 -0000 1.3
@@ -42,3 +42,9 @@
kolab_musr: @kolab_musr@
kolab_mgrp: @kolab_mgrp@
hashmethod: @sbindir@/slappasswd -s
+templatedir: @sysconfdir@/kolab/templates
+kolabdir: @sysconfdir@/kolab/
+postmapping: @sbindir@/postmap -o @emailserver_confdir@
+KOLABRC: @KOLABRC@
+ftpserver_pidfile: @ftpserver_pidfile@
+sbindir: @sbindir@
\ No newline at end of file
--- kolabconf.in DELETED ---
From cvs at kolab.org Wed Aug 1 17:08:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 17:08:14 +0200 (CEST)
Subject: gunnar: server/kolabconf DEVELOPMENT,1.1,1.2
Message-ID: <20070801150814.23E7D60AE65@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf
In directory doto:/tmp/cvs-serv23245/kolabconf
Modified Files:
DEVELOPMENT
Log Message:
Updated release notes and the Makefile for the new package.
Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/kolabconf/DEVELOPMENT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEVELOPMENT 1 Aug 2007 14:31:35 -0000 1.1
+++ DEVELOPMENT 1 Aug 2007 15:08:12 -0000 1.2
@@ -27,6 +27,14 @@
Kolab Server version e.g. 2.2 and a new source packge will be
provided.
+A NEW VERSION HAS TO BE SET IN BOTH
+
+ bin/kolabconf
+
+AND
+
+ kolabconf.spec
+
For testing purposes the "dist" target will produce source RPM
packages that have the current date attached as release number. This
allows you to continuously upgrade your test installation.
From cvs at kolab.org Wed Aug 1 17:08:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 1 Aug 2007 17:08:14 +0200 (CEST)
Subject: gunnar: server Makefile,1.26,1.27 release-notes.txt,1.142,1.143
Message-ID: <20070801150814.2513860AE6B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23245
Modified Files:
Makefile release-notes.txt
Log Message:
Updated release notes and the Makefile for the new package.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile 27 Jul 2007 10:30:33 -0000 1.26
+++ Makefile 1 Aug 2007 15:08:12 -0000 1.27
@@ -28,7 +28,9 @@
BASE_PACKAGES=openldap \
php-smarty
-KOLAB_PACKAGES=kolabd \
+KOLAB_PACKAGES=perl-kolab \
+ kolabconf \
+ kolabd \
kolab-horde-fbview \
kolab-horde-framework \
kolab-resource-handlers \
@@ -74,13 +76,18 @@
done
.PHONY: kolab
-kolab: stage
- cd perl-kolab && make -f Makefile.cvs dist
+kolab: stage perl-kolab/Makefile kolabconf/Makefile
for PKG in $(KOLAB_PACKAGES); \
do \
cd $$PKG && make dist || exit $?; cd ..; \
done
+perl-kolab/Makefile: perl-kolab/Makefile.PL
+ cd perl-kolab && perl Makefile.PL
+
+kolabconf/Makefile: kolabconf/Makefile.PL
+ cd kolabconf && perl Makefile.PL
+
.PHONY: horde
horde: stage
for PKG in $(HORDE_PACKAGES); \
@@ -98,7 +105,7 @@
echo 'Remember to update 00INDEX.rdf and install-kolab.sh!'
.PHONY: clean
-clean: clean-base clean-horde clean-stage
+clean: clean-base clean-kolab clean-horde clean-stage
.PHONY: clean-stage
clean-stage:
@@ -110,6 +117,11 @@
do \
make -C $$PKG clean || exit $?; \
done
+
+.PHONY: clean-kolab
+clean-kolab: stage
+ cd perl-kolab && perl Makefile.PL && make clean_all
+ cd kolabconf && perl Makefile.PL && make clean_all
.PHONY: clean-horde
clean-horde:
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- release-notes.txt 31 Jul 2007 11:54:33 -0000 1.142
+++ release-notes.txt 1 Aug 2007 15:08:12 -0000 1.143
@@ -35,6 +35,15 @@
Replaced several variables originally rewritten during the
make cycle with values in a central configuration file.
+ Converted the package into a standard perl library package.
+
+ FIXME: Is it possible to downgrade this package to
+ perl-kolab-2.1.99 (or later perl-kolab-2.2)?
+
+ - kolabconf-2.1.99-2007????:
+
+ New package that holds the kolabconf script.
+
- kolabd-2.1.99-2007????:
Added "discard" service to the postfix master.cf configuration.
@@ -48,6 +57,8 @@
Replaced several variables originally rewritten during the
make cycle with values in a central configuration file.
+
+ Moved kolabconf into its own package.
Changes between 2.1.0 and 2.2-beta1:
From cvs at kolab.org Thu Aug 2 08:43:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 08:43:12 +0200 (CEST)
Subject: gunnar: server/kolabconf/bin kolabconf.in,1.2,1.3
Message-ID: <20070802064312.3C7AD600174@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/bin
In directory doto:/tmp/cvs-serv17255/bin
Modified Files:
kolabconf.in
Log Message:
Fixes for the splitted packages. Configuration values read via Kolab.pm should not be used in global scope. The release number should be set manually.
Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/kolabconf/bin/kolabconf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabconf.in 1 Aug 2007 14:31:35 -0000 1.2
+++ kolabconf.in 2 Aug 2007 06:43:09 -0000 1.3
@@ -35,13 +35,12 @@
use Sys::Syslog;
use IO::File;
use Kolab;
-
-Kolab::reloadConfig("@CONFIG_FILE@");
-
use Kolab::Util;
use Kolab::Conf;
use Kolab::LDAP;
use vars qw($opt_d $opt_n $opt_h);
+
+Kolab::reloadConfig("@CONFIG_FILE@");
openlog('kolabconf', 'cons, pid', 'user');
From cvs at kolab.org Thu Aug 2 08:43:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 08:43:12 +0200 (CEST)
Subject: gunnar: server/kolabconf/lib/Kolab Conf.pm,1.3,1.4
Message-ID: <20070802064312.3C56A600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv17255/lib/Kolab
Modified Files:
Conf.pm
Log Message:
Fixes for the splitted packages. Configuration values read via Kolab.pm should not be used in global scope. The release number should be set manually.
Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Conf.pm 1 Aug 2007 14:31:35 -0000 1.3
+++ Conf.pm 2 Aug 2007 06:43:10 -0000 1.4
@@ -59,16 +59,6 @@
our $VERSION = sprintf "%d.%03d", q$Revision$ =~ /(\d+)/g;
-my $templatedir = $Kolab::config{"templatedir"};
-
-my %special_templates = (
- "$templatedir/transport.template" => 1,
- "$templatedir/virtual.template" => 1,
- "$templatedir/imapd.group.template" => 1,
- "$templatedir/cyrus.conf.template" => 1,
- "$templatedir/slapd.access.template" => 1,
- "$templatedir/slapd.replicas.template" => 1);
-
my %templates = ();
my %ownership = ();
my %permissions = ();
@@ -102,6 +92,17 @@
my $perm = shift;
my $oldcfg = $cfg . '.old';
+ my $templatedir = $Kolab::config{"templatedir"};
+
+ my %special_templates = (
+ "$templatedir/transport.template" => 1,
+ "$templatedir/virtual.template" => 1,
+ "$templatedir/imapd.group.template" => 1,
+ "$templatedir/cyrus.conf.template" => 1,
+ "$templatedir/slapd.access.template" => 1,
+ "$templatedir/slapd.replicas.template" => 1
+ );
+
my $oldmask = umask 077;
copy($cfg, $oldcfg);
#chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
@@ -273,6 +274,8 @@
my $map = shift;
Kolab::log('T', "Building Postfix $map map", KOLAB_DEBUG);
+ my $templatedir = $Kolab::config{"templatedir"};
+
my $keytemplate = "$templatedir/$map.template";
my $cfg = $templates{$keytemplate};
my $oldcfg = $cfg . '.old';
@@ -346,6 +349,8 @@
{
Kolab::log('T', 'Building Cyrus config', KOLAB_DEBUG);
+ my $templatedir = $Kolab::config{"templatedir"};
+
my $keytemplate = "$templatedir/cyrus.conf.template";
my $cfg = $templates{$keytemplate};
my $imapdtemplate = "$templatedir/imapd.conf.template";
@@ -425,6 +430,8 @@
{
Kolab::log('T', 'Building Cyrus groups', KOLAB_DEBUG);
+ my $templatedir = $Kolab::config{"templatedir"};
+
my $keytemplate = "$templatedir/imapd.group.template";
my $cfg = $templates{$keytemplate};
my $oldcfg = $cfg . '.old';
@@ -497,6 +504,9 @@
sub buildLDAPAccess
{
Kolab::log('T', 'Building LDAP access file', KOLAB_DEBUG);
+
+ my $templatedir = $Kolab::config{"templatedir"};
+
my $keytemplate = "$templatedir/slapd.access.template";
my $cfg = $templates{$keytemplate};
my $oldcfg = $cfg . '.old';
@@ -588,6 +598,8 @@
{
Kolab::log('T', 'Building LDAP replicas', KOLAB_DEBUG);
+ my $templatedir = $Kolab::config{"templatedir"};
+
my $keytemplate = "$templatedir/slapd.replicas.template";
my $cfg = $templates{$keytemplate};
my $oldcfg = $cfg . '.old';
@@ -709,6 +721,7 @@
my $section="";
my %runonchange;
+ my $templatedir = $Kolab::config{"templatedir"};
Kolab::log('T', 'Regenerating configuration files', KOLAB_DEBUG );
@@ -745,6 +758,8 @@
my $key;
my $value;
+ my $templatedir = $Kolab::config{"templatedir"};
+
Kolab::log('T', 'Checking generated config file permissions and ownership', KOLAB_DEBUG );
loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership );
@@ -778,38 +793,38 @@
sub reload
{
if ($haschanged{'slapd'}) {
- &log('K', 'Restarting OpenLDAP...');
+ &Kolab::log('K', 'Restarting OpenLDAP...');
system("$Kolab::config{'KOLABRC'} rc openldap restart &");
}
if ($haschanged{'saslauthd'}) {
- &log('K', 'Restarting SASLAuthd...');
+ &Kolab::log('K', 'Restarting SASLAuthd...');
system("$Kolab::config{'KOLABRC'} rc sasl stop; sleep 1; $Kolab::config{sbindir}/saslauthd -a ldap -n 5");
}
if ($haschanged{'apache'}) {
- &log('K', 'Reloading Apache...');
+ &Kolab::log('K', 'Reloading Apache...');
system("$Kolab::config{sbindir}/apachectl graceful");
}
if ($haschanged{'postfix'}) {
- &log('K', 'Reloading Postfix...');
+ &Kolab::log('K', 'Reloading Postfix...');
system("$Kolab::config{sbindir}/postfix reload");
}
if ($haschanged{'imapd'}) {
- &log('K', 'Restarting imapd...');
+ &Kolab::log('K', 'Restarting imapd...');
# Would it be enough with a reload here? /steffen
system("$Kolab::config{'KOLABRC'} rc imapd restart");
}
if ($haschanged{'amavisd'}) {
- &log('K', 'Restarting amavisd...');
+ &Kolab::log('K', 'Restarting amavisd...');
system("$Kolab::config{'KOLABRC'} rc amavisd restart");
}
if ($haschanged{'clamav'}) {
- &log('K', 'Restarting clamav...');
+ &Kolab::log('K', 'Restarting clamav...');
system("$Kolab::config{'KOLABRC'} rc clamav restart");
}
@@ -817,17 +832,17 @@
Kolab::log('K', 'Starting ProFTPd if not running');
system("$Kolab::config{'KOLABRC'} rc proftpd start");
if ($haschanged{'proftpd'}) {
- &log('K', 'Reloading ProFTPd...');
+ &Kolab::log('K', 'Reloading ProFTPd...');
kill('SIGHUP', `cat $Kolab::config{ftpserver_pidfile}`);
}
} else {
- &log('K', 'Stopping ProFTPd, if running...');
+ &Kolab::log('K', 'Stopping ProFTPd, if running...');
system("$Kolab::config{'KOLABRC'} rc proftpd stop");
}
%Kolab::Conf::haschanged = ();
- &log('K', 'Reload finished');
+ &Kolab::log('K', 'Reload finished');
}
1;
From cvs at kolab.org Thu Aug 2 08:43:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 08:43:12 +0200 (CEST)
Subject: gunnar: server/kolabconf DEVELOPMENT, 1.2, 1.3 Makefile.PL, 1.3,
1.4 kolabconf.spec, 1.3, 1.4
Message-ID: <20070802064312.3C0F3600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf
In directory doto:/tmp/cvs-serv17255
Modified Files:
DEVELOPMENT Makefile.PL kolabconf.spec
Log Message:
Fixes for the splitted packages. Configuration values read via Kolab.pm should not be used in global scope. The release number should be set manually.
Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/kolabconf/DEVELOPMENT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEVELOPMENT 1 Aug 2007 15:08:12 -0000 1.2
+++ DEVELOPMENT 2 Aug 2007 06:43:09 -0000 1.3
@@ -36,5 +36,5 @@
kolabconf.spec
For testing purposes the "dist" target will produce source RPM
-packages that have the current date attached as release number. This
-allows you to continuously upgrade your test installation.
\ No newline at end of file
+packages that have the release number from the kolabconf.spec file
+attached. You need to update the kolabxonf.spec manually.
\ No newline at end of file
Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.PL 1 Aug 2007 14:31:35 -0000 1.3
+++ Makefile.PL 2 Aug 2007 06:43:09 -0000 1.4
@@ -89,7 +89,7 @@
PACKAGE = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_package' kolabconf.spec | sed -e 's/.*V_package\\s*\\([a-z\\-\\_]*\\).*/\\1/')
VERSION = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_version' kolabconf.spec | sed -e 's/.*V_version\\s*\\([0-9.]*\\).*/\\1/')
-RELEASE = \$(shell date '+%Y%m%d')
+RELEASE = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_release' kolabconf.spec | sed -e 's/.*V_release\\s*\\([0-9.]*\\).*/\\1/')
clean_all: veryclean
rm -rf bin/kolabconf
Index: kolabconf.spec
===================================================================
RCS file: /kolabrepository/server/kolabconf/kolabconf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabconf.spec 1 Aug 2007 14:31:35 -0000 1.3
+++ kolabconf.spec 2 Aug 2007 06:43:09 -0000 1.4
@@ -27,7 +27,7 @@
%define V_perl 5.8.8
%define V_package kolabconf
%define V_version 2.1.99
-%define V_release %(date '+%%Y%%m%%d')
+%define V_release 20070801
# package information
Name: %{V_package}
From cvs at kolab.org Thu Aug 2 08:46:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 08:46:24 +0200 (CEST)
Subject: gunnar: server/perl-kolab DEVELOPMENT, 1.1, 1.2 Makefile.PL, 1.1,
1.2 perl-kolab.spec, 1.98, 1.99
Message-ID: <20070802064624.9BF6B600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv17741
Modified Files:
DEVELOPMENT Makefile.PL perl-kolab.spec
Log Message:
Fixes for the splitted packages. The release number should be set manually.
Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/perl-kolab/DEVELOPMENT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEVELOPMENT 1 Aug 2007 14:57:41 -0000 1.1
+++ DEVELOPMENT 2 Aug 2007 06:46:22 -0000 1.2
@@ -36,5 +36,5 @@
perl-kolab.spec
For testing purposes the "dist" target will produce source RPM
-packages that have the current date attached as release number. This
-allows you to continuously upgrade your test installation.
\ No newline at end of file
+packages that have the release number from perl-kolab.spec
+attached. You will have to update this release number manually.
\ No newline at end of file
Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.PL 1 Aug 2007 14:57:41 -0000 1.1
+++ Makefile.PL 2 Aug 2007 06:46:22 -0000 1.2
@@ -53,7 +53,7 @@
PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
VERSION = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_version' perl-kolab.spec | sed -e 's/.*V_version\\s*\\([0-9.]*\\).*/\\1/')
-RELEASE = \$(shell date '+%Y%m%d')
+RELEASE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_release' perl-kolab.spec | sed -e 's/.*V_release\\s*\\([0-9.]*\\).*/\\1/')
clean_all: veryclean
rm -rf \$(KOLABRPMTMP)/\$(PACKAGE)
Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- perl-kolab.spec 1 Aug 2007 14:57:41 -0000 1.98
+++ perl-kolab.spec 2 Aug 2007 06:46:22 -0000 1.99
@@ -27,7 +27,7 @@
%define V_perl 5.8.8
%define V_package perl-kolab
%define V_version 2.1.99
-%define V_release %(date '+%%Y%%m%%d')
+%define V_release 20070801
# package information
Name: %{V_package}
From cvs at kolab.org Thu Aug 2 08:49:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 08:49:45 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd kolab_upgrade.in, 1.4,
1.5 kolabcheckperm.in, 1.3, 1.4 kolabd.in, 1.6,
1.7 kolabd.spec.in, 1.11, 1.12 kolabquotareport.in, 1.2,
1.3 kolabquotawarn.in, 1.12, 1.13
Message-ID: <20070802064945.97599600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv18040
Modified Files:
kolab_upgrade.in kolabcheckperm.in kolabd.in kolabd.spec.in
kolabquotareport.in kolabquotawarn.in
Log Message:
Fixes for the splitted packages. Added kolabconf dependency. Modified the perl scripts so that we don't create the impression that the configuration is loaded before the perl imports are handled.
Index: kolab_upgrade.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_upgrade.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab_upgrade.in 31 Jul 2007 11:54:33 -0000 1.4
+++ kolab_upgrade.in 2 Aug 2007 06:49:43 -0000 1.5
@@ -7,11 +7,10 @@
use Term::ReadKey;
use Kolab;
-
-Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
-
use Kolab::Util;
use Kolab::LDAP;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
Kolab::LDAP::startup("@kolab_statedir@");
Index: kolabcheckperm.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabcheckperm.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabcheckperm.in 31 Jul 2007 11:54:33 -0000 1.3
+++ kolabcheckperm.in 2 Aug 2007 06:49:43 -0000 1.4
@@ -9,10 +9,9 @@
use strict;
use Kolab;
-
-Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
-
use Kolab::Util;
use Kolab::Conf;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
exit( Kolab::Conf::checkPermissions>0?0:-1 );
Index: kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabd.in 31 Jul 2007 11:54:33 -0000 1.6
+++ kolabd.in 2 Aug 2007 06:49:43 -0000 1.7
@@ -42,13 +42,12 @@
use Sys::Syslog;
use IO::File;
use Kolab;
-
-Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
-
use Kolab::Util;
use Kolab::LDAP;
use Kolab::LDAP::Backend;
use vars qw(%pids);
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
openlog('kolabd', 'cons, pid', 'user');
Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolabd.spec.in 17 Jul 2007 15:07:15 -0000 1.11
+++ kolabd.spec.in 2 Aug 2007 06:49:43 -0000 1.12
@@ -64,7 +64,8 @@
PreReq: perl-ssl
PreReq: perl-www
PreReq: perl-ldap
-PreReq: perl-kolab >= 5.8.8-20070607
+PreReq: perl-kolab >= 2.1.99-20070801
+PreReq: kolabconf
AutoReq: no
AutoReqProv: no
Index: kolabquotareport.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotareport.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabquotareport.in 31 Jul 2007 11:54:33 -0000 1.2
+++ kolabquotareport.in 2 Aug 2007 06:49:43 -0000 1.3
@@ -35,12 +35,11 @@
use Mail::Message;
use Cyrus::IMAP::Admin;
use Kolab;
-
-Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
-
use Kolab::Util;
use Kolab::LDAP;
use vars qw($opt_d);
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
Kolab::LDAP::startup("@kolab_statedir@");
Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolabquotawarn.in 31 Jul 2007 11:54:33 -0000 1.12
+++ kolabquotawarn.in 2 Aug 2007 06:49:43 -0000 1.13
@@ -37,13 +37,12 @@
use Mail::Transport::SMTP;
use Cyrus::IMAP::Admin;
use Kolab;
-
-Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
-
use Kolab::Util;
use Kolab::LDAP;
use File::Basename;
use vars qw($opt_d);
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
Kolab::LDAP::startup("@kolab_statedir@");
From cvs at kolab.org Thu Aug 2 09:25:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:25:35 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Console_Getopt ChangeLog, 1.1, NONE Makefile,
1.5, NONE PEAR-Console_Getopt.spec, 1.5, NONE
Message-ID: <20070802072535.05F3A600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv19708/PEAR-Console_Getopt
Removed Files:
ChangeLog Makefile PEAR-Console_Getopt.spec
Log Message:
These two PEAR packages are obsolete on a 2.2 server.
--- ChangeLog DELETED ---
--- Makefile DELETED ---
--- PEAR-Console_Getopt.spec DELETED ---
From cvs at kolab.org Thu Aug 2 09:25:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:25:34 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Archive_Tar ChangeLog, 1.1, NONE Makefile,
1.6, NONE PEAR-Archive_Tar.spec, 1.5, NONE
Message-ID: <20070802072534.F181C600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv19708/PEAR-Archive_Tar
Removed Files:
ChangeLog Makefile PEAR-Archive_Tar.spec
Log Message:
These two PEAR packages are obsolete on a 2.2 server.
--- ChangeLog DELETED ---
--- Makefile DELETED ---
--- PEAR-Archive_Tar.spec DELETED ---
From cvs at kolab.org Thu Aug 2 09:26:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:26:26 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Console_Getopt .cvsignore,1.1,NONE
Message-ID: <20070802072626.F0D8C600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Console_Getopt
In directory doto:/tmp/cvs-serv19790/PEAR-Console_Getopt
Removed Files:
.cvsignore
Log Message:
These two PEAR packages are obsolete on a 2.2 server.
--- .cvsignore DELETED ---
From cvs at kolab.org Thu Aug 2 09:26:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:26:26 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Archive_Tar .cvsignore,1.1,NONE
Message-ID: <20070802072626.EEFD4600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Archive_Tar
In directory doto:/tmp/cvs-serv19790/PEAR-Archive_Tar
Removed Files:
.cvsignore
Log Message:
These two PEAR packages are obsolete on a 2.2 server.
--- .cvsignore DELETED ---
From cvs at kolab.org Thu Aug 2 09:33:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:33:02 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd .cvsignore,1.1,1.2
Message-ID: <20070802073302.C077C600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv20532
Modified Files:
.cvsignore
Log Message:
Ignore the rewritten kolab.globals.
Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore 12 Mar 2007 14:31:33 -0000 1.1
+++ .cvsignore 2 Aug 2007 07:33:00 -0000 1.2
@@ -11,3 +11,4 @@
kolabcheckperm
kolabd.spec
missing
+kolab.globals
From cvs at kolab.org Thu Aug 2 09:33:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:33:41 +0200 (CEST)
Subject: gunnar: server Makefile,1.27,1.28
Message-ID: <20070802073341.4237F600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv20808
Modified Files:
Makefile
Log Message:
Remove two PEAR packages from the global Makefile.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile 1 Aug 2007 15:08:12 -0000 1.27
+++ Makefile 2 Aug 2007 07:33:39 -0000 1.28
@@ -36,9 +36,7 @@
kolab-resource-handlers \
kolab-webadmin \
-HORDE_PACKAGES=pear/PEAR-Archive_Tar \
- pear/PEAR-Auth_SASL \
- pear/PEAR-Console_Getopt \
+HORDE_PACKAGES=pear/PEAR-Auth_SASL \
pear/PEAR-Date \
pear/PEAR-Log \
pear/PEAR-Mail \
From cvs at kolab.org Thu Aug 2 09:33:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:33:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Auth_SASL Makefile,1.5,1.6
Message-ID: <20070802073357.52A37600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Auth_SASL
In directory doto:/tmp/cvs-serv20944/PEAR-Auth_SASL
Modified Files:
Makefile
Log Message:
Update PEAR Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Auth_SASL/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 23 Jul 2007 17:23:21 -0000 1.5
+++ Makefile 2 Aug 2007 07:33:55 -0000 1.6
@@ -1,16 +1,20 @@
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
-endif
-
-RPM = /kolab/bin/openpkg rpm
-
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
PACKAGE = PEAR-$(PEAR_NAME)
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
From cvs at kolab.org Thu Aug 2 09:33:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:33:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Date Makefile,1.5,1.6
Message-ID: <20070802073357.56840600174@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Date
In directory doto:/tmp/cvs-serv20944/PEAR-Date
Modified Files:
Makefile
Log Message:
Update PEAR Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Date/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 23 Jul 2007 17:23:21 -0000 1.5
+++ Makefile 2 Aug 2007 07:33:55 -0000 1.6
@@ -1,16 +1,20 @@
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
-endif
-
-RPM = /kolab/bin/openpkg rpm
-
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
PACKAGE = PEAR-$(PEAR_NAME)
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
From cvs at kolab.org Thu Aug 2 09:33:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:33:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Log Makefile,1.5,1.6
Message-ID: <20070802073357.5D86B60AE40@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Log
In directory doto:/tmp/cvs-serv20944/PEAR-Log
Modified Files:
Makefile
Log Message:
Update PEAR Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Log/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 23 Jul 2007 17:23:21 -0000 1.5
+++ Makefile 2 Aug 2007 07:33:55 -0000 1.6
@@ -1,16 +1,20 @@
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
-endif
-
-RPM = /kolab/bin/openpkg rpm
-
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
PACKAGE = PEAR-$(PEAR_NAME)
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
From cvs at kolab.org Thu Aug 2 09:33:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:33:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail_Mime Makefile,1.5,1.6
Message-ID: <20070802073357.7CE96600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail_Mime
In directory doto:/tmp/cvs-serv20944/PEAR-Mail_Mime
Modified Files:
Makefile
Log Message:
Update PEAR Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail_Mime/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 23 Jul 2007 17:23:21 -0000 1.5
+++ Makefile 2 Aug 2007 07:33:55 -0000 1.6
@@ -1,16 +1,20 @@
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
-endif
-
-RPM = /kolab/bin/openpkg rpm
-
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
PACKAGE = PEAR-$(PEAR_NAME)
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
From cvs at kolab.org Thu Aug 2 09:33:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:33:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Mail Makefile,1.5,1.6
Message-ID: <20070802073357.633D060AE42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Mail
In directory doto:/tmp/cvs-serv20944/PEAR-Mail
Modified Files:
Makefile
Log Message:
Update PEAR Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Mail/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 23 Jul 2007 17:23:21 -0000 1.5
+++ Makefile 2 Aug 2007 07:33:55 -0000 1.6
@@ -1,16 +1,20 @@
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
-endif
-
-RPM = /kolab/bin/openpkg rpm
-
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
PACKAGE = PEAR-$(PEAR_NAME)
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
From cvs at kolab.org Thu Aug 2 09:33:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:33:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Socket Makefile,1.5,1.6
Message-ID: <20070802073357.8469060AE40@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Socket
In directory doto:/tmp/cvs-serv20944/PEAR-Net_Socket
Modified Files:
Makefile
Log Message:
Update PEAR Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Socket/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 23 Jul 2007 17:23:21 -0000 1.5
+++ Makefile 2 Aug 2007 07:33:55 -0000 1.6
@@ -1,16 +1,20 @@
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
-endif
-
-RPM = /kolab/bin/openpkg rpm
-
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
PACKAGE = PEAR-$(PEAR_NAME)
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
From cvs at kolab.org Thu Aug 2 09:33:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:33:57 +0200 (CEST)
Subject: gunnar: server/pear/PEAR-Net_Sieve Makefile,1.5,1.6
Message-ID: <20070802073357.82FA8600174@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/pear/PEAR-Net_Sieve
In directory doto:/tmp/cvs-serv20944/PEAR-Net_Sieve
Modified Files:
Makefile
Log Message:
Update PEAR Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/pear/PEAR-Net_Sieve/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 23 Jul 2007 17:23:21 -0000 1.5
+++ Makefile 2 Aug 2007 07:33:55 -0000 1.6
@@ -1,16 +1,20 @@
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
-endif
-
-RPM = /kolab/bin/openpkg rpm
-
PEAR_NAME = $(shell grep "%define[ ]*V_pear_name" *.spec | sed -e "s/.*V_pear_name \([a-z\-\_]*\).*/\1/")
PACKAGE = PEAR-$(PEAR_NAME)
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
+ifeq "x$(KOLABRPMSRC)" "x"
+ KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
+endif
SOURCE_0=http://pear.php.net/get/$(PEAR_NAME)-$(VERSION).tgz
From cvs at kolab.org Thu Aug 2 09:57:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:57:15 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp Makefile,1.3,1.4
Message-ID: <20070802075715.CD56460AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv23115/horde-imp
Modified Files:
Makefile
Log Message:
Fix the Horde package Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 23 Jul 2007 16:06:42 -0000 1.3
+++ Makefile 2 Aug 2007 07:57:13 -0000 1.4
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-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/")
From cvs at kolab.org Thu Aug 2 09:57:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:57:15 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo Makefile,1.3,1.4
Message-ID: <20070802075715.D0DC760AE44@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv23115/horde-ingo
Modified Files:
Makefile
Log Message:
Fix the Horde package Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 23 Jul 2007 16:06:42 -0000 1.3
+++ Makefile 2 Aug 2007 07:57:13 -0000 1.4
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-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/")
From cvs at kolab.org Thu Aug 2 09:57:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:57:15 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag Makefile,1.3,1.4
Message-ID: <20070802075715.DB38D60AE46@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv23115/horde-nag
Modified Files:
Makefile
Log Message:
Fix the Horde package Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 23 Jul 2007 16:06:43 -0000 1.3
+++ Makefile 2 Aug 2007 07:57:13 -0000 1.4
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-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/")
From cvs at kolab.org Thu Aug 2 09:57:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:57:15 +0200 (CEST)
Subject: gunnar: server/horde/horde-kolab-client Makefile,1.1,1.2
Message-ID: <20070802075715.D476560AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kolab-client
In directory doto:/tmp/cvs-serv23115/horde-kolab-client
Modified Files:
Makefile
Log Message:
Fix the Horde package Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-kolab-client/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 23 Jul 2007 15:14:21 -0000 1.1
+++ Makefile 2 Aug 2007 07:57:13 -0000 1.2
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-RPM = /kolab/bin/openpkg rpm
PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
From cvs at kolab.org Thu Aug 2 09:57:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:57:15 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo Makefile,1.3,1.4
Message-ID: <20070802075715.E5C2460AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv23115/horde-mnemo
Modified Files:
Makefile
Log Message:
Fix the Horde package Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 23 Jul 2007 16:06:43 -0000 1.3
+++ Makefile 2 Aug 2007 07:57:13 -0000 1.4
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-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/")
From cvs at kolab.org Thu Aug 2 09:57:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:57:16 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith Makefile,1.3,1.4
Message-ID: <20070802075716.16C1D60AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv23115/horde-kronolith
Modified Files:
Makefile
Log Message:
Fix the Horde package Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 23 Jul 2007 16:06:42 -0000 1.3
+++ Makefile 2 Aug 2007 07:57:13 -0000 1.4
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-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/")
From cvs at kolab.org Thu Aug 2 09:57:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:57:15 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework Makefile,1.5,1.6
Message-ID: <20070802075715.C9E0460AE42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv23115/horde-framework
Modified Files:
Makefile
Log Message:
Fix the Horde package Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 23 Jul 2007 16:06:42 -0000 1.5
+++ Makefile 2 Aug 2007 07:57:13 -0000 1.6
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-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/")
From cvs at kolab.org Thu Aug 2 09:57:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:57:15 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba Makefile,1.3,1.4
Message-ID: <20070802075715.E281F60AE48@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv23115/horde-turba
Modified Files:
Makefile
Log Message:
Fix the Horde package Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 23 Jul 2007 16:06:43 -0000 1.3
+++ Makefile 2 Aug 2007 07:57:13 -0000 1.4
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-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/")
From cvs at kolab.org Thu Aug 2 09:57:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:57:16 +0200 (CEST)
Subject: gunnar: server/horde/horde Makefile,1.11,1.12
Message-ID: <20070802075716.189D860AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv23115/horde
Modified Files:
Makefile
Log Message:
Fix the Horde package Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile 23 Jul 2007 16:06:42 -0000 1.11
+++ Makefile 2 Aug 2007 07:57:13 -0000 1.12
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-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/")
From cvs at kolab.org Thu Aug 2 09:57:15 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 09:57:15 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd Makefile,1.3,1.4
Message-ID: <20070802075715.DED5360AE47@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv23115/horde-passwd
Modified Files:
Makefile
Log Message:
Fix the Horde package Makefiles.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 23 Jul 2007 16:06:43 -0000 1.3
+++ Makefile 2 Aug 2007 07:57:13 -0000 1.4
@@ -1,11 +1,15 @@
+ifeq "x$(RPM)" "x"
+ RPM = $(HOME)/bin/openpkg rpm
+endif
ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = /kolab/RPM/SRC
+ KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = /kolab/RPM/PKG
+ KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+ KOLABRPMTMP = $(HOME)/RPM/TMP
endif
-
-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/")
From cvs at kolab.org Thu Aug 2 10:04:36 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:04:36 +0200 (CEST)
Subject: gunnar: server/horde/fbview-horde - New directory
Message-ID: <20070802080436.68DBB60AE42@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv23382/fbview-horde
Log Message:
Directory /kolabrepository/server/horde/fbview-horde added to the repository
From cvs at kolab.org Thu Aug 2 10:09:08 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:09:08 +0200 (CEST)
Subject: gunnar: server/perl-kolab perl-kolab.spec,1.99,1.100
Message-ID: <20070802080908.D7A0660AE44@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv23695/perl-kolab
Modified Files:
perl-kolab.spec
Log Message:
Updated release number
Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- perl-kolab.spec 2 Aug 2007 06:46:22 -0000 1.99
+++ perl-kolab.spec 2 Aug 2007 08:09:06 -0000 1.100
@@ -27,7 +27,7 @@
%define V_perl 5.8.8
%define V_package perl-kolab
%define V_version 2.1.99
-%define V_release 20070801
+%define V_release 20070802
# package information
Name: %{V_package}
From cvs at kolab.org Thu Aug 2 10:09:08 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:09:08 +0200 (CEST)
Subject: gunnar: server/kolabconf kolabconf.spec,1.4,1.5
Message-ID: <20070802080908.D3B2C60AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf
In directory doto:/tmp/cvs-serv23695/kolabconf
Modified Files:
kolabconf.spec
Log Message:
Updated release number
Index: kolabconf.spec
===================================================================
RCS file: /kolabrepository/server/kolabconf/kolabconf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolabconf.spec 2 Aug 2007 06:43:09 -0000 1.4
+++ kolabconf.spec 2 Aug 2007 08:09:06 -0000 1.5
@@ -27,7 +27,7 @@
%define V_perl 5.8.8
%define V_package kolabconf
%define V_version 2.1.99
-%define V_release 20070801
+%define V_release 20070802
# package information
Name: %{V_package}
From cvs at kolab.org Thu Aug 2 10:09:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:09:50 +0200 (CEST)
Subject: gunnar: server Makefile,1.28,1.29
Message-ID: <20070802080950.B14C960AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23747
Modified Files:
Makefile
Log Message:
Add a first fbview component.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile 2 Aug 2007 07:33:39 -0000 1.28
+++ Makefile 2 Aug 2007 08:09:46 -0000 1.29
@@ -43,6 +43,7 @@
pear/PEAR-Mail_Mime \
pear/PEAR-Net_Sieve \
pear/PEAR-Net_Socket \
+ horde/fbiview-horde \
horde/horde-framework \
horde/horde-passwd \
horde/horde \
From cvs at kolab.org Thu Aug 2 10:09:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:09:50 +0200 (CEST)
Subject: gunnar: server/horde/fbview-horde .cvsignore, NONE, 1.1 ChangeLog,
NONE, 1.1 Makefile, NONE, 1.1 conf.php, NONE,
1.1 fbview-horde-conf.template, NONE, 1.1 fbview-horde.spec,
NONE, 1.1 hooks.php, NONE, 1.1 registry.php, NONE, 1.1
Message-ID: <20070802080950.B5C7760AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv23747/horde/fbview-horde
Added Files:
.cvsignore ChangeLog Makefile conf.php
fbview-horde-conf.template fbview-horde.spec hooks.php
registry.php
Log Message:
Add a first fbview component.
--- NEW FILE: .cvsignore ---
*.src.rpm
--- NEW FILE: ChangeLog ---
2007-08-02 Gunnar Wrobel
* fbview-horde.spec: Added package to Kolab CVS.
--- NEW FILE: Makefile ---
ifeq "x$(RPM)" "x"
RPM = $(HOME)/bin/openpkg rpm
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
KOLABRPMPKG = $(HOME)/RPM/PKG
endif
ifeq "x$(KOLABRPMTMP)" "x"
KOLABRPMTMP = $(HOME)/RPM/TMP
endif
HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = fbview-$(HORDE_NAME)
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")
PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
.PHONY: dist
dist: all
cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
.PHONY: clean
clean:
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
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
cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
--- NEW FILE: conf.php ---
--- NEW FILE: fbview-horde.spec ---
# Versions
%define V_horde_name horde
%define V_package fbview-%{V_horde_name}
%define V_year 2007
%define V_month 08
%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
# Package Information
Name: %{V_package}
Summary: The Horde Application Framework
URL: http://www.horde.org/
Packager: Gunnar Wrobel (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: fbview-horde-conf.template
Source2: hooks.php
Source3: conf.php
Source4: registry.php
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
PreReq: PEAR-Mail_Mime >= 1.3.1
PreReq: PEAR-Mail >= 1.1.14
PreReq: horde-framework-kolab >= %{V_version}
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/fbview
%{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/fbview
%{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/fbview/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-kolab-conf.template'\
'%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/fbview/config/conf.php' \
'%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/conf.php' \
'%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/hooks.php' \
'%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/registry.php'
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
--- NEW FILE: hooks.php ---
_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: registry.php ---
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 Thu Aug 2 10:09:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:09:50 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework horde-framework-kolab.spec, 1.7,
1.8
Message-ID: <20070802080950.BB13060AE47@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv23747/horde/horde-framework
Modified Files:
horde-framework-kolab.spec
Log Message:
Add a first fbview component.
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde-framework-kolab.spec 23 Jul 2007 16:06:42 -0000 1.7
+++ horde-framework-kolab.spec 2 Aug 2007 08:09:48 -0000 1.8
@@ -2,8 +2,8 @@
%define V_horde_name framework
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 07
-%define V_day 23
+%define V_month 08
+%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 Aug 2 10:19:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:19:10 +0200 (CEST)
Subject: gunnar: server Makefile,1.29,1.30
Message-ID: <20070802081910.32D30600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24008
Modified Files:
Makefile
Log Message:
Fix fbview-horde to compile into a source RPM.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile 2 Aug 2007 08:09:46 -0000 1.29
+++ Makefile 2 Aug 2007 08:19:08 -0000 1.30
@@ -43,7 +43,7 @@
pear/PEAR-Mail_Mime \
pear/PEAR-Net_Sieve \
pear/PEAR-Net_Socket \
- horde/fbiview-horde \
+ horde/fbview-horde \
horde/horde-framework \
horde/horde-passwd \
horde/horde \
@@ -105,6 +105,7 @@
.PHONY: clean
clean: clean-base clean-kolab clean-horde clean-stage
+ find . | grep "~$" | xargs rm
.PHONY: clean-stage
clean-stage:
From cvs at kolab.org Thu Aug 2 10:19:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:19:10 +0200 (CEST)
Subject: gunnar: server/horde/fbview-horde fbview-horde-conf.template, 1.1,
1.2 fbview-horde.spec, 1.1, 1.2
Message-ID: <20070802081910.3820860AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv24008/horde/fbview-horde
Modified Files:
fbview-horde-conf.template fbview-horde.spec
Log Message:
Fix fbview-horde to compile into a source RPM.
Index: fbview-horde-conf.template
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde-conf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fbview-horde-conf.template 2 Aug 2007 08:09:48 -0000 1.1
+++ fbview-horde-conf.template 2 Aug 2007 08:19:08 -0000 1.2
@@ -1,5 +1,5 @@
KOLAB_META_START
-TARGET=/kolab/var/kolab/www/horde/config/kolab.php
+TARGET=/kolab/var/kolab/www/fbview/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=kolab-n:kolab-n
KOLAB_META_END
Index: fbview-horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fbview-horde.spec 2 Aug 2007 08:09:48 -0000 1.1
+++ fbview-horde.spec 2 Aug 2007 08:19:08 -0000 1.2
@@ -62,7 +62,7 @@
%{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/fbview
+ cp -r horde/* $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
@@ -71,7 +71,7 @@
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-kolab-conf.template'\
+ '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-horde-conf.template'\
'%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/fbview/config/conf.php' \
'%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/conf.php' \
'%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/hooks.php' \
From cvs at kolab.org Thu Aug 2 10:24:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:24:22 +0200 (CEST)
Subject: gunnar: server/horde/fbview-kronolith - New directory
Message-ID: <20070802082422.1CFD7600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv24205/fbview-kronolith
Log Message:
Directory /kolabrepository/server/horde/fbview-kronolith added to the repository
From cvs at kolab.org Thu Aug 2 10:25:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:25:20 +0200 (CEST)
Subject: gunnar: server/horde/fbview-kronolith ChangeLog, NONE, 1.1 Makefile,
NONE, 1.1 conf.php, NONE, 1.1 fbview-kronolith-conf.template,
NONE, 1.1 fbview-kronolith.spec, NONE, 1.1
Message-ID: <20070802082520.DDC9160AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv24268/horde/fbview-kronolith
Added Files:
ChangeLog Makefile conf.php fbview-kronolith-conf.template
fbview-kronolith.spec
Log Message:
Add the second component for the new fbview in CVS.
--- NEW FILE: ChangeLog ---
2007-08-02 Gunnar Wrobel
* fbview-kronolith.spec: Added package to Kolab CVS.
--- NEW FILE: Makefile ---
ifeq "x$(RPM)" "x"
RPM = $(HOME)/bin/openpkg rpm
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
KOLABRPMPKG = $(HOME)/RPM/PKG
endif
ifeq "x$(KOLABRPMTMP)" "x"
KOLABRPMTMP = $(HOME)/RPM/TMP
endif
HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = fbview-$(HORDE_NAME)
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")
PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
.PHONY: dist
dist: all
cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
.PHONY: clean
clean:
rm -rf /kolab/RPM/TMP/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
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
cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
--- NEW FILE: conf.php ---
--- NEW FILE: fbview-kronolith.spec ---
# Versions
%define V_horde_name kronolith
%define V_package fbview-%{V_horde_name}
%define V_year 2007
%define V_month 08
%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
# Package Information
Name: %{V_package}
Summary: Kronolith is the Horde calendar application.
URL: http://www.horde.org/
Packager: Gunnar Wrobel (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: fbview-kronolith-conf.template
Source2: conf.php
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
PreReq: horde-framework-kolab >= %{V_version}
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/fbview/%{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/fbview/
%{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/fbview/%{V_horde_name}/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-kronolith-conf.template' \
'%config(noreplace) %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/conf.php'
%clean
rm -rf $RPM_BUILD_ROOT
%files -f files
From cvs at kolab.org Thu Aug 2 10:25:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:25:20 +0200 (CEST)
Subject: gunnar: server Makefile,1.30,1.31
Message-ID: <20070802082520.D7DBF600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24268
Modified Files:
Makefile
Log Message:
Add the second component for the new fbview in CVS.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile 2 Aug 2007 08:19:08 -0000 1.30
+++ Makefile 2 Aug 2007 08:25:18 -0000 1.31
@@ -44,6 +44,7 @@
pear/PEAR-Net_Sieve \
pear/PEAR-Net_Socket \
horde/fbview-horde \
+ horde/fbview-kronolith \
horde/horde-framework \
horde/horde-passwd \
horde/horde \
From cvs at kolab.org Thu Aug 2 10:39:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:39:24 +0200 (CEST)
Subject: gunnar: server install-kolab.sh,1.2,1.3
Message-ID: <20070802083924.02690600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24561
Modified Files:
install-kolab.sh
Log Message:
Update the install script to allow selecting add on packages.
Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- install-kolab.sh 27 Jul 2007 06:23:22 -0000 1.2
+++ install-kolab.sh 2 Aug 2007 08:39:21 -0000 1.3
@@ -9,17 +9,26 @@
INSTALL=""
+PACKAGES="openpkg-tools kolabd kolab-webadmin kolab-resource-handlers"
+
#Flags
FLAG_BASE=""
FLAG_ENV=""
FLAG_CLEAN=""
+FLAG_FBVIEW=""
usage() {
echo "Usage:"
+ echo " $0 (will try to determine mode of action itself)"
+ echo
echo " $0 -i directory/openpkg-*-*.src.sh"
echo " $0 -i directory/openpkg-*-*.ix86-debian4.0.sh"
echo " $0 -i directory"
echo
+ echo "Options:"
+ echo
+ echo " -F (install the free/busy view frontend)"
+ echo
echo " -h (display this help)"
echo
echo "Advanced options:"
@@ -42,7 +51,7 @@
exit 1
}
-while getopts hcBDSEi:V:p:I:u:t: ARGS; do
+while getopts hcBDSEFi:V:p:I:u:t: ARGS; do
case $ARGS in
h) # Display help
usage
@@ -71,6 +80,9 @@
E) # User only wants the basic openpkg environment
FLAG_ENV="Yes"
;;
+ F) # User wants to install fbview
+ FLAG_FBVIEW="Yes"
+ ;;
c) # User wants to erase the openpkg environment
FLAG_CLEAN="Yes"
;;
@@ -90,6 +102,10 @@
USER=$TAG
fi
+if [ -n "$FLAG_FBVIEW" ]; then
+ PACKAGES="$PACKAGES fbview-kronolith"
+fi
+
if [ -z "$PREFIX" ]; then
PREFIX="/$TAG"
fi
@@ -260,9 +276,7 @@
-Dkolab-webadmin::kolab_version=$KOLAB_VERSION
"
fi
- "$PREFIX/bin/openpkg" build -kK -r "$DIR" -p "$PLATTAG" $DEFINE \
- openpkg-tools kolabd kolab-webadmin kolab-resource-handlers kolab-horde-fbview | sh \
- || exit $?
+ "$PREFIX/bin/openpkg" build -kK -r "$DIR" -p "$PLATTAG" $DEFINE $PACKAGES | sh || exit $?
fi
exit 0
From cvs at kolab.org Thu Aug 2 10:39:39 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 10:39:39 +0200 (CEST)
Subject: gunnar: server/horde/fbview-kronolith .cvsignore, NONE,
1.1 fbview-kronolith.spec, 1.1, 1.2
Message-ID: <20070802083939.8D0D060AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv24601/fbview-kronolith
Modified Files:
fbview-kronolith.spec
Added Files:
.cvsignore
Log Message:
Fixes to the fbview-kronolith package.
--- NEW FILE: .cvsignore ---
*.src.rpm
Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fbview-kronolith.spec 2 Aug 2007 08:25:18 -0000 1.1
+++ fbview-kronolith.spec 2 Aug 2007 08:39:37 -0000 1.2
@@ -33,6 +33,7 @@
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
+PreReq: fbview-horde >= %{V_version}
PreReq: horde-framework-kolab >= %{V_version}
AutoReq: no
From cvs at kolab.org Thu Aug 2 12:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 12:34:40 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/dist_conf common,1.36,1.37
Message-ID: <20070802103440.3B3E0600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv27390/kolabd/dist_conf
Modified Files:
common
Log Message:
* kolabd.spec.in:
Ensure the php error dir gets the correct ownership.
* Makefile.am (install-data-hook):
Create a directory for php errors.
* dist_conf/common (do_subst):
Add the webserver_logdir in the replacement ops.
* templates/httpd.conf.template.in:
The graphics directory is now called themes
* templates/php.ini.template.in (error_reporting):
Log php errors into a file rather than displaying them.
Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- common 27 Jul 2007 18:25:20 -0000 1.36
+++ common 2 Aug 2007 10:34:38 -0000 1.37
@@ -138,6 +138,7 @@
-e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \
-e 's,[@]webserver_confdir[@],$(webserver_confdir),g' \
-e 's,[@]webserver_document_root[@],$(webserver_document_root),g' \
+ -e 's,[@]webserver_logdir[@],$(webserver_logdir),g' \
-e 's,[@]webserver_errorlogfile[@],$(webserver_errorlogfile),g' \
-e 's,[@]webserver_grp[@],$(webserver_grp),g' \
-e 's,[@]webserver_musr[@],$(webserver_musr),g' \
From cvs at kolab.org Thu Aug 2 12:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 12:34:40 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.107, 1.108 Makefile.am, 1.30,
1.31 kolabd.spec.in, 1.12, 1.13
Message-ID: <20070802103440.3D87A600174@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv27390/kolabd
Modified Files:
ChangeLog Makefile.am kolabd.spec.in
Log Message:
* kolabd.spec.in:
Ensure the php error dir gets the correct ownership.
* Makefile.am (install-data-hook):
Create a directory for php errors.
* dist_conf/common (do_subst):
Add the webserver_logdir in the replacement ops.
* templates/httpd.conf.template.in:
The graphics directory is now called themes
* templates/php.ini.template.in (error_reporting):
Log php errors into a file rather than displaying them.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- ChangeLog 1 Aug 2007 15:03:46 -0000 1.107
+++ ChangeLog 2 Aug 2007 10:34:38 -0000 1.108
@@ -1,3 +1,25 @@
+2007-08-02 Gunnar Wrobel
+
+ * kolabd.spec.in:
+
+ Ensure the php error dir gets the correct ownership.
+
+ * Makefile.am (install-data-hook):
+
+ Create a directory for php errors.
+
+ * dist_conf/common (do_subst):
+
+ Add the webserver_logdir in the replacement ops.
+
+ * templates/httpd.conf.template.in:
+
+ The "graphics" directory is now called "themes"
+
+ * templates/php.ini.template.in (error_reporting):
+
+ Log php errors into a file rather than displaying them.
+
2007-08-01 Gunnar Wrobel
* Makefile.am:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile.am 1 Aug 2007 15:03:46 -0000 1.30
+++ Makefile.am 2 Aug 2007 10:34:38 -0000 1.31
@@ -567,6 +567,7 @@
$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/cgi-bin
$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/icons
$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/freebusy
+ $(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_logdir)/php
$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_sessions)
$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_statedir)
$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolabd.spec.in 2 Aug 2007 06:49:43 -0000 1.12
+++ kolabd.spec.in 2 Aug 2007 10:34:38 -0000 1.13
@@ -102,6 +102,7 @@
# generate file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/httpd_sessions \
+ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache2/log/php \
'%config %{l_prefix}/etc/kolab/*.pem' \
'%config %{l_prefix}/etc/kolab/*.schema' \
'%config %{l_prefix}/etc/kolab/kolab.conf' \
From cvs at kolab.org Thu Aug 2 12:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 12:34:40 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/templates httpd.conf.template.in, 1.9,
1.10 php.ini.template.in, 1.5, 1.6
Message-ID: <20070802103440.3FF9B60AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv27390/kolabd/templates
Modified Files:
httpd.conf.template.in php.ini.template.in
Log Message:
* kolabd.spec.in:
Ensure the php error dir gets the correct ownership.
* Makefile.am (install-data-hook):
Create a directory for php errors.
* dist_conf/common (do_subst):
Add the webserver_logdir in the replacement ops.
* templates/httpd.conf.template.in:
The graphics directory is now called themes
* templates/php.ini.template.in (error_reporting):
Log php errors into a file rather than displaying them.
Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- httpd.conf.template.in 17 Jul 2007 15:26:05 -0000 1.9
+++ httpd.conf.template.in 2 Aug 2007 10:34:38 -0000 1.10
@@ -151,7 +151,7 @@
Order allow,deny
Allow from all
-
+
Order allow,deny
Allow from all
Index: php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- php.ini.template.in 17 Jul 2007 15:26:05 -0000 1.5
+++ php.ini.template.in 2 Aug 2007 10:34:38 -0000 1.6
@@ -21,6 +21,11 @@
memory_limit = 16M ; Maximum amount of memory a script may consume
post_max_size = 8M ; Maximum amount of POST data accepted
+error_reporting = E_ALL
+display_errors = Off
+log_errors = On
+error_log = @webserver_logdir@/php/php-errors.log
+
; Include Paths
;include_path = ".:/kolab/lib/php"
include_path = ".:@phplibdir@:@phplibdir2@:@phppeardir@"
From cvs at kolab.org Thu Aug 2 12:35:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 12:35:21 +0200 (CEST)
Subject: gunnar: server/horde/fbview-kronolith prefs.php, NONE, 1.1 Makefile,
1.1, 1.2 fbview-kronolith.spec, 1.2, 1.3
Message-ID: <20070802103521.C0FB560AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv27471/horde/fbview-kronolith
Modified Files:
Makefile fbview-kronolith.spec
Added Files:
prefs.php
Log Message:
A first installable version of the new fbview packages.
--- NEW FILE: prefs.php ---
_("Display Options"),
'label' => _("User Interface"),
'desc' => _("Select confirmation options, how to display the different views and choose default view."),
'members' => array('confirm_delete', 'defaultview',
'time_between_days', 'week_start_monday',
'day_hour_start', 'day_hour_end', 'day_hour_force',
'slots_per_hour', 'show_icons', 'show_legend', 'show_panel',
'show_fb_legend', 'show_shared_side_by_side'),
);
$prefGroups['summary'] = array(
'column' => _("Display Options"),
'label' => _("Portal Options"),
'desc' => _("Select which events to show in the portal."),
'members' => array('summary_days', 'summary_alarms'),
);
$apis = array();
foreach ($GLOBALS['registry']->listAPIs() as $api) {
if ($GLOBALS['registry']->hasMethod($api . '/listTimeObjects')) {
$apis[$api] = $GLOBALS['registry']->get('name', $GLOBALS['registry']->hasInterface($api));
}
}
if (!isset($apis['tasks']) && $GLOBALS['registry']->hasMethod('tasks/listTasks')) {
$apis['tasks'] = $GLOBALS['registry']->get('name', $GLOBALS['registry']->hasInterface('tasks'));
}
if (count($apis)) {
$prefGroups['external'] = array(
'column' => _("Display Options"),
'label' => _("Tasks and other external events"),
'desc' => _("Do you want to show external events in your calendar (like tasks which are due etc) ?"),
'members' => array('show_external', 'show_external_colors'),
);
}
$prefGroups['share'] = array(
'column' => _("Calendars"),
'label' => _("Default Calendar"),
'desc' => _("Choose your default calendar."),
'members' => array('shareselect'),
);
if (!empty($GLOBALS['conf']['holidays']['enable'])) {
$prefGroups['holidays'] = array(
'column' => _("Calendars"),
'label' => _("Holidays"),
'desc' => _("Choose which holidays to display"),
'members' => array('holiday_drivers'),
);
}
$prefGroups['remote'] = array(
'column' => _("Calendars"),
'label' => _("Remote Calendars"),
'desc' => _("Manage remote calendars."),
'members' => array('remote_cal_management'),
);
$prefGroups['event_options'] = array(
'column' => _("Events"),
'label' => _("Event Defaults"),
'desc' => _("Set default values for new events."),
'members' => array('default_alarm_management'),
);
$prefGroups['notification'] = array(
'column' => _("Events"),
'label' => _("Notifications"),
'desc' => _("Choose how you want to be notified about event changes, event alarms and upcoming events."),
'members' => array('event_notification', 'event_notification_exclude_self', 'daily_agenda', 'event_reminder'),
);
if (!empty($GLOBALS['conf']['alarms']['driver'])) {
$prefGroups['notification']['members'][] = 'event_alarms';
}
$prefGroups['freebusy'] = array(
'column' => _("Calendars"),
'label' => _("Free/Busy Information"),
'desc' => _("Set your free/busy calendars and your own and other users' free/busy options."),
'members' => array('fb_cals_select', 'freebusy_days'),
);
if ($GLOBALS['registry']->hasMethod('contacts/sources')) {
$prefGroups['addressbooks'] = array(
'column' => _("Other Options"),
'label' => _("Address Books"),
'desc' => _("Select address book sources for adding and searching for addresses."),
'members' => array('display_contact', 'sourceselect'),
);
}
// confirm deletion of events which don't recur?
$_prefs['confirm_delete'] = array(
'value' => 1,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Confirm deletion of events?")
);
// default view
$_prefs['defaultview'] = array(
'value' => 'attendees',
'locked' => false,
'shared' => false,
'type' => 'enum',
'enum' => array('day' => _("Day"),
'week' => _("Week"),
'workweek' => _("Work Week"),
'month' => _("Month")),
'desc' => _("Select the view to display on startup:")
);
// Display the timeslots between each day column, in week view.
$_prefs['time_between_days'] = array(
'value' => 0,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Show time of day between each day in week views?")
);
// what day does the week start with
$_prefs['week_start_monday'] = array(
'value' => '0',
'locked' => false,
'shared' => false,
'type' => 'enum',
'desc' => _("Select the first weekday:"),
'enum' => array('0' => _("Sunday"),
'1' => _("Monday"))
);
// start of the time range in day/week views:
$_prefs['day_hour_start'] = array(
'value' => 16,
'locked' => false,
'shared' => false,
'type' => 'select',
'desc' => _("What time should day and week views start, when there are no earlier events?")
);
// end of the time range in day/week views:
$_prefs['day_hour_end'] = array(
'value' => 48,
'locked' => false,
'shared' => false,
'type' => 'select',
'desc' => _("What time should day and week views end, when there are no later events?")
);
// enforce hour slots?
$_prefs['day_hour_force'] = array(
'value' => 0,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Restrict day and week views to these time slots, even if there are earlier or later events?")
);
// number of slots in each hour:
$_prefs['slots_per_hour'] = array(
'value' => 1,
'locked' => false,
'shared' => false,
'type' => 'enum',
'desc' => _("How long should the time slots on the day and week views be?"),
'enum' => array(4 => _("15 minutes"),
3 => _("20 minutes"),
2 => _("30 minutes"),
1 => _("1 hour"))
);
// show delete/alarm icons in the calendar view?
$_prefs['show_icons'] = array(
'value' => 1,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Show delete, alarm, and recurrence icons in calendar views?")
);
// show category legend?
// a value of 0 = no, 1 = yes
$_prefs['show_legend'] = array(
'value' => 1,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Show category legend?")
);
// show the calendar options panel?
// a value of 0 = no, 1 = yes
$_prefs['show_panel'] = array(
'value' => 1,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Show calendar options panel?")
);
// show free/busy legend?
// a value of 0 = no, 1 = yes
$_prefs['show_fb_legend'] = array(
'value' => 1,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Show free/busy legend?")
);
// collapsed or side by side view
$_prefs['show_shared_side_by_side'] = array(
'value' => 0,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Show shared calendars side-by-side?")
);
// days to show in summary
$_prefs['summary_days'] = array(
'value' => 7,
'locked' => false,
'shared' => false,
'type' => 'enum',
'desc' => _("Select the time span to show:"),
'enum' => array(1 => '1 ' . _("day"),
2 => '2 ' . _("days"),
3 => '3 ' . _("days"),
4 => '4 ' . _("days"),
5 => '5 ' . _("days"),
6 => '6 ' . _("days"),
7 => '1 ' . _("week"),
14 => '2 ' . _("weeks"),
21 => '3 ' . _("weeks"),
28 => '4 ' . _("weeks"))
);
// show alarms in summary?
$_prefs['summary_alarms'] = array(
'value' => 0,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Show only events that have an alarm set?")
);
// show external events in the calendar views?
$_prefs['show_external'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => false,
'type' => 'multienum',
'enum' => $apis,
'desc' => _("Select which external events you would like to display")
);
// show external event colors?
$_prefs['show_external_colors'] = array(
'value' => 1,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Show external events using category colors?")
);
// default calendar selection widget
$_prefs['shareselect'] = array('type' => 'special');
// default calendar
// Set locked to true if you don't want users to have multiple calendars.
$_prefs['default_share'] = array(
'value' => Auth::getAuth() ? Auth::getAuth() : 0,
'locked' => false,
'shared' => false,
'type' => 'implicit',
);
// Which drivers are we supposed to use to examine holidays?
$_prefs['holiday_drivers'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => false,
'type' => 'multienum',
'desc' => _("Which kind of holidays do you want to get displayed?"),
);
// store the calendars to diplay
$_prefs['display_cals'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => false,
'type' => 'implicit',
);
// default alarm
$_prefs['default_alarm'] = array(
'value' => '',
'locked' => false,
'shared' => false,
'type' => 'implicit',
);
$_prefs['default_alarm_management'] = array('type' => 'special');
// remote calendars
$_prefs['remote_cals'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => false,
'type' => 'implicit',
);
$_prefs['remote_cal_management'] = array('type' => 'special');
// store the remote calendars to display
$_prefs['display_remote_cals'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => false,
'type' => 'implicit'
);
// new event notifications
$_prefs['event_notification'] = array(
'value' => '',
'locked' => false,
'shared' => false,
'type' => 'enum',
'enum' => array('' => _("No"),
'owner' => _("On my calendars only"),
'show' => _("On all shown calendars"),
'read' => _("On all calendars I have read access to")),
'desc' => _("Choose if you want to be notified of new, edited, and deleted events by email:")
);
// daily agenda
$_prefs['daily_agenda'] = array(
'value' => '',
'locked' => false,
'shared' => false,
'type' => 'enum',
'enum' => array('' => _("No"),
'owner' => _("On my calendars only"),
'show' => _("On all shown calendars"),
'read' => _("On all calendars I have read access to")),
'desc' => _("Choose if you want to receive daily agenda email reminders:")
);
$_prefs['event_notification_exclude_self'] = array(
'value' => 0,
'locked' => false,
'shared' => false,
'type' => 'checkbox',
'desc' => _("Don't send me a notification if I've added, changed or deleted the event?")
);
// reminder notifications
$_prefs['event_reminder'] = array(
'value' => 'owner',
'locked' => false,
'shared' => false,
'type' => 'enum',
'enum' => array('' => _("No"),
'owner' => _("On my calendars only"),
'show' => _("On all shown calendars"),
'read' => _("On all calendars I have read access to")),
'desc' => _("Choose if you want to receive reminders for events with alarms:")
);
// alarm methods
$_prefs['event_alarms'] = array(
'value' => 'a:1:{s:6:"notify";a:0:{}}',
'locked' => false,
'shared' => false,
'type' => 'alarm',
'desc' => _("Choose how you want to receive reminders for events with alarms:")
);
// number of days to generate free/busy information for:
$_prefs['freebusy_days'] = array(
'value' => 30,
'locked' => false,
'shared' => false,
'type' => 'number',
'desc' => _("How many days of free/busy information should we generate?")
);
// By default, display all contacts in the address book when loading
// the contacts screen. If your default address book is large and
// slow to display, you may want to disable and lock this option.
$_prefs['display_contact'] = array(
'value' => 1,
'locked' => false,
'shared' => true,
'type' => 'checkbox',
'desc' => _("List all contacts when loading the contacts screen? (if disabled, you will only see contacts that you search for explicitly)"),
);
// address book selection widget
$_prefs['sourceselect'] = array('type' => 'special');
// address book(s) to use when expanding addresses
// You can provide default values this way (note the \t and the double quotes):
// 'value' => "source_one\tsource_two"
// refer to turba/config/sources.php for possible source values
$_prefs['search_sources'] = array(
'value' => "",
'locked' => false,
'shared' => false,
'type' => 'implicit',
);
// field(s) to use when expanding addresses
// This depends on the search_sources preference if you want to provide
// default values:
// 'value' => "source_one\tfield_one\tfield_two\nsource_two\tfield_three"
// will search the fields 'field_one' and 'field_two' in source_one and
// 'field_three' in source_two.
// refer to turba/config/sources.php for possible source and field values
$_prefs['search_fields'] = array(
'value' => "",
'locked' => false,
'shared' => false,
'type' => 'implicit',
);
// Calendars to include in generating free/busy URLs.
$_prefs['fb_cals'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => false,
'type' => 'implicit',
'desc' => _("Choose the calendars to include when generating free/busy URLs:")
);
// Free/busy calendars selector.
$_prefs['fb_cals_select'] = array('type' => 'special');
// The following two preferences are no longer used and only necessary for the
// upgrade script.
$_prefs['event_categories'] = array(
'value' => '',
'locked' => false,
'shared' => false,
'type' => 'implicit'
);
$_prefs['event_colors'] = array(
'value' => '',
'locked' => false,
'shared' => false,
'type' => 'implicit'
);
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 2 Aug 2007 08:25:18 -0000 1.1
+++ Makefile 2 Aug 2007 10:35:19 -0000 1.2
@@ -19,8 +19,8 @@
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = fbview-$(HORDE_NAME)
-VERSION = ${YEAR}${MONTH}${DAY}
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbview-kronolith.spec 2 Aug 2007 08:39:37 -0000 1.2
+++ fbview-kronolith.spec 2 Aug 2007 10:35:19 -0000 1.3
@@ -4,9 +4,9 @@
%define V_year 2007
%define V_month 08
%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
+%define V_version 2.1.5.99
+%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
@@ -24,6 +24,7 @@
Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
Source1: fbview-kronolith-conf.template
Source2: conf.php
+Source3: prefs.php
# Build Info
Prefix: %{l_prefix}
@@ -62,12 +63,13 @@
%{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} \
+ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2} %{S:3} \
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
- '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-kronolith-conf.template' \
- '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/conf.php'
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+ '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-kronolith-conf.template' \
+ '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/conf.php' \
+ '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/prefs.php'
%clean
rm -rf $RPM_BUILD_ROOT
From cvs at kolab.org Thu Aug 2 12:35:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 12:35:21 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.143,1.144
Message-ID: <20070802103521.B3FA3600173@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv27471
Modified Files:
release-notes.txt
Log Message:
A first installable version of the new fbview packages.
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- release-notes.txt 1 Aug 2007 15:08:12 -0000 1.143
+++ release-notes.txt 2 Aug 2007 10:35:19 -0000 1.144
@@ -60,6 +60,11 @@
Moved kolabconf into its own package.
+ Fixed the apache configuration for the new fbview packages
+
+ Switched from displaying php errors to logging them
+ (recommended for production servers).
+
Changes between 2.1.0 and 2.2-beta1:
FIXME (add CVS changes between 2.1.0 and 20070608 + patch series)
From cvs at kolab.org Thu Aug 2 12:35:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 12:35:21 +0200 (CEST)
Subject: gunnar: server/horde/fbview-horde prefs.php, NONE, 1.1 Makefile, 1.1,
1.2 conf.php, 1.1, 1.2 fbview-horde-conf.template, 1.2,
1.3 fbview-horde.spec, 1.2, 1.3
Message-ID: <20070802103521.BBD3E600174@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv27471/horde/fbview-horde
Modified Files:
Makefile conf.php fbview-horde-conf.template fbview-horde.spec
Added Files:
prefs.php
Log Message:
A first installable version of the new fbview packages.
--- NEW FILE: prefs.php ---
'enum'.
*
* escaped: For an enum or a select, are the keys and values already
* html-escaped? Defaults to false if not present.
*
* hook: Call a hook function for the value of this preference
* true: Will call the function _prefs_hook_
* to fill in the value of this preference.
* See hooks.php for more details.
* false: Normal behaviour - no hook is called.
*/
$prefGroups['identities'] = array(
'column' => _("Your Information"),
'label' => _("Personal Information"),
'desc' => _("Change the name and address that people see when they read and reply to your emails."),
'members' => array('default_identity', 'identityselect', 'deleteidentity',
'id', 'fullname', 'from_addr')
);
$auth = &Auth::singleton($GLOBALS['conf']['auth']['driver']);
if (is_a($auth, 'Auth') && $auth->hasCapability('update')) {
$prefGroups['forgotpass'] = array(
'column' => _("Your Information"),
'label' => _("Account Password"),
'desc' => _("Set options to allow you to reset your password if you ever forget it."),
'members' => array('security_question', 'security_answer', 'alternate_email')
);
}
$prefGroups['language'] = array(
'column' => _("Your Information"),
'label' => _("Locale and Time"),
'desc' => _("Set your preferred language, timezone and date options."),
'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'first_week_day')
);
$prefGroups['categories'] = array(
'column' => _("Your Information"),
'label' => _("Categories and Labels"),
'desc' => _("Manage the list of categories you have to label items with, and colors associated with those categories."),
'members' => array('categorymanagement')
);
$prefGroups['display'] = array(
'column' => _("Other Information"),
'label' => _("Display Options"),
'desc' => _("Set your startup application, color scheme, page refreshing, and other display options."),
'members' => array('initial_application', 'show_last_login', 'theme',
'summary_refresh_time', 'show_sidebar', 'sidebar_width',
'moz_sidebar', 'menu_view', 'menu_refresh_time',
'widget_accesskey')
);
$prefGroups['logintasks'] = array(
'column' => _("Other Information"),
'label' => _("Login Tasks"),
'desc' => sprintf(_("Customize tasks to run upon logon to %s."), $GLOBALS['registry']->get('name')),
'members' => array('do_maintenance', 'confirm_maintenance')
);
$prefGroups['remote'] = array(
'column' => _("Other Information"),
'label' => _("Remote Servers"),
'desc' => _("Set up remote servers that you want to access from your portal."),
'url' => 'services/portal/rpcsum.php'
);
// For alternate IMSP authentication.
if (!empty($GLOBALS['conf']['imsp']['enabled'])) {
$prefGroups['imspauth'] = array(
'column' => _("Other Information"),
'label' => _("Alternate IMSP Login"),
'desc' => _("Use if name/password is different for IMSP server."),
'members' => array('imsp_auth_user', 'imsp_auth_pass')
);
}
// Determine functionality of richtext editor
$prefGroups['richtext'] = array(
'column' => _("Other Information"),
'label' => _("Rich Text Editor Options"),
'desc' => _("Which plugins to enable for the Rich Text editor."),
'members' => array('editor_plugins'),
);
$prefGroups['syncml'] = array(
'column' => _("Other Information"),
'label' => _("SyncML"),
'desc' => _("Configuration for syncing with PDAs, Smartphones and Outlook."),
'url' => 'services/portal/syncml.php',
'members' => array()
);
// Personal Information preferences
// default identity
// Set locked to true if you don't want the users to have multiple identities.
$_prefs['default_identity'] = array(
'value' => 0,
'locked' => false,
'shared' => true,
'type' => 'enum',
'enum' => (isset($GLOBALS['identity']) && is_object($GLOBALS['identity'])) ? $GLOBALS['identity']->getAll('id') : array(),
'desc' => _("Your default identity:"),
);
// identities array
// Don't change anything here.
$_prefs['identities'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => true,
'type' => 'implicit',
);
// identify email confirmation
$_prefs['confirm_email'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => true,
'type' => 'implicit',
);
// identity selection widget
$_prefs['identityselect'] = array(
'shared' => true,
'type' => 'special',
);
// delete button
$_prefs['deleteidentity'] = array(
'type' => 'special',
'shared' => true,
);
// identity name
// If you lock this preference, you must specify a value or a hook for it in
// horde/config/hooks.php.
$_prefs['id'] = array(
'value' => '',
'locked' => false,
'shared' => true,
'type' => 'text',
'desc' => _("Identity's name:")
);
// user full name for From: line
// If you lock this preference, you must specify a value or a hook for it in
// horde/config/hooks.php.
$_prefs['fullname'] = array(
'value' => '',
'locked' => false,
'shared' => true,
'type' => 'text',
'desc' => _("Your full name:")
);
// user preferred email address for From: line
// If you lock this preference, you must specify a value or a hook for it in
// horde/config/hooks.php.
$_prefs['from_addr'] = array(
'value' => '',
'locked' => false,
'shared' => true,
'type' => 'text',
'desc' => _("Your From: address:")
);
// user security question
$_prefs['security_question'] = array(
'value' => '',
'locked' => false,
'shared' => true,
'type' => 'text',
'desc' => _("Enter a security question which you will be asked if you need to reset your password, e.g. 'what is the name of your pet?':")
);
// user security answer
$_prefs['security_answer'] = array(
'value' => '',
'locked' => false,
'shared' => true,
'type' => 'text',
'desc' => _("Insert the required answer to the security question:")
);
// user alternate email
$_prefs['alternate_email'] = array(
'value' => '',
'locked' => false,
'shared' => true,
'type' => 'text',
'desc' => _("Insert an email address to which you can receive the new password:")
);
// user language
$_prefs['language'] = array(
'value' => '',
'locked' => false,
'shared' => true,
'type' => 'select',
'escaped' => true,
'desc' => _("Select your preferred language:")
);
// user time zone
$_prefs['timezone'] = array(
'value' => '',
'locked' => false,
'shared' => true,
'type' => 'select',
'desc' => _("Your current time zone:")
);
// time format
$_prefs['twentyFour'] = array(
'value' => false,
'locked' => false,
'shared' => true,
'type' => 'checkbox',
'desc' => _("Display 24-hour times?")
);
// date format
$_prefs['date_format'] = array(
'value' => '%x',
'locked' => false,
'shared' => true,
'type' => 'enum',
'enum' => array(
'%x' => strftime('%x'),
'%Y-%m-%d' => strftime('%Y-%m-%d'),
'%d/%m/%Y' => strftime('%d/%m/%Y'),
'%A %B %d, %Y' => strftime('%A %B %d, %Y'),
'%A, %d. %B %Y' => strftime('%A, %d. %B %Y'),
'%A, %d %B %Y' => strftime('%A, %d %B %Y'),
'%a, %b %e, %Y' => strftime('%a, %b %e, %Y'),
'%a, %b %e, %y' => strftime('%a, %b %e, %y'),
'%a, %b %e' => strftime('%a, %b %e'),
'%a, %e %b %Y' => strftime('%a, %e %b %Y'),
'%a, %e %b %y' => strftime('%a, %e %b %y'),
'%a %d %b %Y' => strftime ('%a %d %b %Y'),
'%a %x' => strftime ('%a %x'),
'%a %Y-%m-%d' => strftime ('%a %Y-%m-%d'),
'%e %b %Y' => strftime('%e %b %Y'),
'%e. %b %Y' => strftime('%e. %b %Y'),
'%e. %m %Y' => strftime('%e %m %Y'),
'%e. %m.' => strftime('%e. %m.'),
'%e. %B' => strftime('%e. %B'),
'%e. %B %Y' => strftime('%e. %B %Y'),
'%e. %B %y' => strftime('%e. %B %y'),
'%B %e, %Y' => strftime('%B %e, %Y'),
),
'desc' => _("Choose how to display dates:"),
);
// what day should be displayed as the first day of the week?
$_prefs['first_week_day'] = array(
'value' => '0',
'locked' => false,
'shared' => true,
'type' => 'enum',
'desc' => _("Which day would you like to be displayed as the first day of the week?"),
'enum' => array('0' => _("Sunday"),
'1' => _("Monday"))
);
// UI theme
$_prefs['theme'] = array(
'value' => 'bluewhite',
'locked' => false,
'shared' => true,
'type' => 'select',
'desc' => _("Select your color scheme.")
);
// categories
$_prefs['categories'] = array(
'value' => '',
'locked' => false,
'shared' => true,
'type' => 'implicit'
);
// category colors
$_prefs['category_colors'] = array(
'value' => '',
'locked' => false,
'shared' => true,
'type' => 'implicit'
);
// UI for category management.
$_prefs['categorymanagement'] = array(
'type' => 'special'
);
$_prefs['summary_refresh_time'] = array(
'value' => 300,
'locked' => false,
'shared' => false,
'type' => 'enum',
'enum' => array(0 => _("Never"),
30 => _("Every 30 seconds"),
60 => _("Every minute"),
300 => _("Every 5 minutes"),
900 => _("Every 15 minutes"),
1800 => _("Every half hour")),
'desc' => _("Refresh Portal View:")
);
$_prefs['show_sidebar'] = array(
'value' => false,
'locked' => false,
'shared' => true,
'type' => 'checkbox',
'desc' => sprintf(_("Show the %s Menu on the left?"), $GLOBALS['registry']->get('name', 'horde'))
);
$_prefs['sidebar_width'] = array(
'value' => 150,
'locked' => false,
'shared' => false,
'type' => 'number',
'desc' => sprintf(_("Width of the %s menu on the left (takes effect on next log-in):"), $GLOBALS['registry']->get('name', 'horde'))
);
$_prefs['moz_sidebar'] = array(
'type' => 'link',
'xurl' => sprintf('javascript:if (window.sidebar && window.sidebar.addPanel) window.sidebar.addPanel(\'%s\', \'%s\', \'%s\'); else alert(\'%s\');',
$GLOBALS['registry']->get('name', 'horde'),
Util::addParameter(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/portal/sidebar.php', true, -1), 'mozbar', '1'),
Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/prefs.php', true, -1),
addslashes(_("Couldn't find the Mozilla Sidebar. Make sure the sidebar is open."))),
'desc' => sprintf(_("Add the %s Menu as a Mozilla Sidebar"), $GLOBALS['registry']->get('name', 'horde'))
);
$_prefs['menu_view'] = array(
'value' => 'both',
'locked' => false,
'shared' => true,
'type' => 'enum',
'enum' => array('text' => _("Text Only"),
'icon' => _("Icons Only"),
'both' => _("Icons with text")),
'desc' => _("Menu mode:")
);
$_prefs['menu_refresh_time'] = array(
'value' => 300,
'locked' => false,
'shared' => true,
'type' => 'enum',
'enum' => array(0 => _("Never"),
30 => _("Every 30 seconds"),
60 => _("Every minute"),
120 => _("Every 2 minutes"),
300 => _("Every 5 minutes")),
'desc' => _("Refresh Dynamic Menu Elements:")
);
// Login/Maintenance Tasks preferences
// To disable maintenance entirely, set 'value' = false and
// 'locked' = true for all of these. To just turn it off by default,
// set 'value' false for do_maintenance.
// perform maintenance operations?
$_prefs['do_maintenance'] = array(
'value' => true,
'locked' => false,
'shared' => true,
'type' => 'checkbox',
'desc' => _("Perform maintenance operations on login?"),
'help' => 'prefs-do_maintenance');
// last time maintenance was run.
// value is a UNIX timestamp of the last time maintenance ran for the user.
$_prefs['last_maintenance'] = array(
'value' => 0,
'locked' => false,
'shared' => true,
'type' => 'implicit'
);
// confirm when doing maintenance operations? If false, they will
// be performed with no input from/check with the user.
$_prefs['confirm_maintenance'] = array(
'value' => true,
'locked' => false,
'shared' => true,
'type' => 'checkbox',
'desc' => _("Ask for confirmation before doing maintenance operations?"),
'help' => 'prefs-confirm_maintenance');
// End Login/Maintenance preferences
// what application should we go to after login?
$_prefs['initial_application'] = array(
'value' => 'kronolith',
'locked' => false,
'shared' => true,
'type' => 'select',
'desc' => sprintf(_("What application should %s display after login?"), $GLOBALS['registry']->get('name'))
);
// should we create access keys?
$_prefs['widget_accesskey'] = array(
'value' => true,
'locked' => false,
'shared' => true,
'type' => 'checkbox',
'desc' => _("Should access keys be defined for most links?")
);
// the layout of the portal page.
$_prefs['portal_layout'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => false,
'type' => 'implicit'
);
// the remote servers.
$_prefs['remote_summaries'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => false,
'type' => 'implicit'
);
// last login time of user
// value is a serialized array of the UNIX timestamp of the last
// login, and the host that the last login was from.
$_prefs['last_login'] = array(
'value' => 'a:0:{}',
'locked' => false,
'shared' => true,
'type' => 'implicit'
);
// show the last login time of user
$_prefs['show_last_login'] = array(
'value' => true,
'locked' => false,
'shared' => true,
'type' => 'checkbox',
'desc' => _("Show last login time when logging in?")
);
if (!empty($GLOBALS['conf']['imsp']['enabled'])) {
$_prefs['imsp_auth_user'] = array(
'value' => '',
'locked' => false,
'shared' => false,
'type' => 'text',
'desc' => _("Alternate IMSP Username")
);
$_prefs['imsp_auth_pass'] = array(
'value' => '',
'locked' => false,
'shared' => false,
'type' => 'password',
'desc' => _("Alternate IMSP Password")
);
}
// Rich Text Editor preferences.
$_prefs['editor_plugins'] = array(
'value' => 'a:2:{i:0;s:8:"ListType";i:1;s:12:"CharacterMap";}',
'locked' => false,
'shared' => true,
'type' => 'multienum',
'enum' => array(
'ContextMenu' => _("Right click context menu"),
'TableOperations' => _("Table operations menu bar"),
'ListType' => _("Allow setting of ordered list type"),
'CharacterMap' => _("Special characters"),
'AnselImage' => _("Insertion of images from Photo Galleries in text")),
'desc' => _("Select editor plugins")
);
// End Rich Text Editor preferences.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 2 Aug 2007 08:09:48 -0000 1.1
+++ Makefile 2 Aug 2007 10:35:19 -0000 1.2
@@ -19,8 +19,8 @@
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = fbview-$(HORDE_NAME)
-VERSION = ${YEAR}${MONTH}${DAY}
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/conf.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- conf.php 2 Aug 2007 08:09:48 -0000 1.1
+++ conf.php 2 Aug 2007 10:35:19 -0000 1.2
@@ -29,7 +29,7 @@
$conf['log']['priority'] = PEAR_LOG_NOTICE;
$conf['log']['ident'] = 'HORDE';
$conf['log']['params'] = array();
-$conf['log']['name'] = '/tmp/horde.log';
+$conf['log']['name'] = '/kolab/var/apache2/fbview/fbview.log';
$conf['log']['params']['append'] = true;
$conf['log']['type'] = 'file';
$conf['log']['enabled'] = true;
Index: fbview-horde-conf.template
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde-conf.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbview-horde-conf.template 2 Aug 2007 08:19:08 -0000 1.2
+++ fbview-horde-conf.template 2 Aug 2007 10:35:19 -0000 1.3
@@ -4,12 +4,10 @@
OWNERSHIP=kolab-n:kolab-n
KOLAB_META_END
Author: gunnar
Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv29765
Modified Files:
Makefile fbview-kronolith.spec
Added Files:
fbview.patch open_savedattlist_win.js savedattlist.inc
savedattlist.php
Log Message:
Add the patches from Kolabs older fbview version. Fixed configuration. First working release will be based on tomorrows Horde snapshot. Release number already adjusted.
--- NEW FILE: fbview.patch ---
Index: attendees.php
===================================================================
RCS file: /repository/kronolith/attendees.php,v
retrieving revision 1.33
diff -u -r1.33 attendees.php
--- attendees.php 27 Jun 2007 17:23:52 -0000 1.33
+++ attendees.php 2 Aug 2007 11:10:29 -0000
@@ -135,6 +135,16 @@
$attendees = array();
$_SESSION['kronolith']['attendees'] = $attendees;
break;
+
+case 'save':
+ if (empty($attendees)) {
+ break;
+ }
+ $savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+ $savedattlist[] = array_keys($attendees);
+ $prefs->setValue('saved_attendee_list', serialize($savedattlist));
+ $notification->push(_('Successfully saved attendee list'), 'horde.success');
+ break;
}
// Get the current Free/Busy view; default to the 'day' view if none specified.
@@ -206,6 +216,14 @@
$title = _("Edit attendees");
require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+if ($browser->hasFeature('javascript')) {
+ Horde::addScriptFile('open_savedattlist_win.js');
+ $savedattlist_url = 'javascript:open_savedattlist_win();';
+} else {
+ $savedattlist_url = Horde::applicationUrl('savedattlist.php');
+}
+
$notification->notify(array('status'));
require KRONOLITH_TEMPLATES . '/attendees/attendees.inc';
require $registry->get('templates', 'horde') . '/common-footer.inc';
Index: config/prefs.php.dist
===================================================================
RCS file: /repository/kronolith/config/prefs.php.dist,v
retrieving revision 1.93
diff -u -r1.93 prefs.php.dist
--- config/prefs.php.dist 18 Jun 2007 16:27:44 -0000 1.93
+++ config/prefs.php.dist 2 Aug 2007 11:10:29 -0000
@@ -459,3 +459,11 @@
'shared' => false,
'type' => 'implicit'
);
+
+$_prefs['saved_attendee_list'] = array(
+ 'value' => 'a:0:{}',
+ 'locked' => false,
+ 'shared' => false,
+ 'type' => 'implicit',
+ 'desc' => _("A saved list of attendees")
+);
Index: lib/FBView.php
===================================================================
RCS file: /repository/kronolith/lib/FBView.php,v
retrieving revision 1.24
diff -u -r1.24 FBView.php
--- lib/FBView.php 27 Jun 2007 17:23:52 -0000 1.24
+++ lib/FBView.php 2 Aug 2007 11:10:29 -0000
@@ -87,8 +87,8 @@
$template = new Horde_Template();
$rows = '';
foreach ($this->_requiredMembers as $member) {
- $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"));
- $template = new Horde_Template();
+ $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams());
+ $template = &new Horde_Template();
$template->set('blocks', $blocks);
$template->set('name', $member->getName());
$rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.tpl');
@@ -108,8 +108,8 @@
$template = new Horde_Template();
$rows = '';
foreach ($this->_optionalMembers as $member) {
- $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"));
- $template = new Horde_Template();
+ $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams());
+ $template = &new Horde_Template();
$template->set('blocks', $blocks);
$template->set('name', $member->getName());
$rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.tpl');
@@ -124,6 +124,9 @@
$html .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/section.tpl');
}
+ //**********
+ //This has been disabled in kolab-fbview. Make this optional?
+
// Possible meeting times.
$optimal->setAttribute('ORGANIZER', _("All Attendees"));
$blocks = $this->_getBlocks($optimal,
@@ -146,6 +149,9 @@
$template->set('blocks', $blocks);
$rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.tpl');
+ //This has been disabled in kolab-fbview. Make this optional?
+ //**********
+
// Reset locale.
setlocale(LC_NUMERIC, $lc);
@@ -218,7 +224,7 @@
return $instances[$view];
}
- function _getBlocks($member, $periods, $blockfile, $label)
+ function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
{
$template = new Horde_Template();
$template->set('label', $label);
@@ -251,6 +257,21 @@
$template->set('left', $left . '%');
$template->set('width', $width . '%');
+ $template->set('evclick', '');
+
+ if (isset($extra[$periodStart])) {
+ if (!empty($extra[$periodStart]['X-UID'])) {
+ $link = "javascript:performAction('viewaction', '"
+ . addslashes($member->getName() . "#"
+ . String::convertCharset(base64_decode($extra[$periodStart]['X-UID']),
+ 'UTF-8',NLS::getCharset())) . "')";
+ $template->set('evclick', $link);
+ }
+ if (!empty($extra[$periodStart]['X-SUMMARY'])) {
+ $template->set('label', String::convertCharset(base64_decode($extra[$periodStart]['X-SUMMARY']),'UTF-8',
+ NLS::getCharset()));
+ }
+ }
$blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);
} else {
Index: templates/attendees/attendees.inc
===================================================================
RCS file: /repository/kronolith/templates/attendees/attendees.inc,v
retrieving revision 1.37
diff -u -r1.37 attendees.inc
--- templates/attendees/attendees.inc 27 Mar 2007 13:22:03 -0000 1.37
+++ templates/attendees/attendees.inc 2 Aug 2007 11:10:30 -0000
@@ -92,6 +92,8 @@
" />
" />
+ " onclick="" />
+ " onclick="performAction('save', '');" />
" />
Index: templates/fbview/busyblock.tpl
===================================================================
RCS file: /repository/kronolith/templates/fbview/busyblock.tpl,v
retrieving revision 1.5
diff -u -r1.5 busyblock.tpl
--- templates/fbview/busyblock.tpl 11 Dec 2006 22:46:02 -0000 1.5
+++ templates/fbview/busyblock.tpl 2 Aug 2007 11:10:30 -0000
@@ -1 +1 @@
-
+
--- NEW FILE: open_savedattlist_win.js ---
--- NEW FILE: savedattlist.inc ---
--- NEW FILE: savedattlist.php ---
* Stuart Binge
*
* See the enclosed file COPYING for license information (GPL). If you
* did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
*/
@define('KRONOLITH_BASE', dirname(__FILE__));
require_once KRONOLITH_BASE . '/lib/base.php';
require_once KRONOLITH_BASE . '/lib/FBView.php';
$title = _('Load Attendee List');
Horde::addScriptFile('tooltip.js', 'horde');
require KRONOLITH_TEMPLATES . '/common-header.inc';
// Get our list of saved attendees
$savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
// Preformat our image urls
$delimg = Horde::img('delete.png', _("Remove List"), null, $GLOBALS['registry']->getImageDir('horde'));
$loadimg = Horde::img('tree/folder.png', _("Load List"), null, $GLOBALS['registry']->getImageDir('horde'));
// Get our Action ID & Value. This specifies what action the user initiated.
$actionID = Util::getFormData('actionID', false);
$actionValue = Util::getFormData('actionValue', false);
if (!$actionID) {
$actionID = (Util::getFormData('addNew', false) ? 'add' : false);
$actionValue = Util::getFormData('newAttendees', '');
}
// Perform the specified action, if there is one.
switch ($actionID) {
case 'remove':
// Remove the specified attendee
if (array_key_exists($actionValue, $savedattlist)) {
unset($savedattlist[$actionValue]);
$prefs->setValue('saved_attendee_list', serialize($savedattlist));
}
break;
case 'dismiss':
// Make sure we're actually allowed to dismiss
if (!$allow_dismiss) break;
// Close the attendee window
global $browser;
if ($browser->hasFeature('javascript')) {
Util::closeWindowJS();
} else {
$url = Util::getFormData('url');
if (!empty($url)) {
$location = Horde::applicationUrl($url, true);
} else {
$url = Util::addParameter($prefs->getValue('defaultview') . '.php', 'month', Util::getFormData('month'));
$url = Util::addParameter($url, 'year', Util::getFormData('year'));
$location = Horde::applicationUrl($url, true);
}
// Make sure URL is unique.
$location = Util::addParameter($location, 'unique', md5(microtime()));
header('Location: ' . $location);
}
break;
}
$form_handler = Horde::applicationUrl('savedattlist.php');
require KRONOLITH_TEMPLATES . '/savedattlist/savedattlist.inc';
require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 2 Aug 2007 10:35:19 -0000 1.2
+++ Makefile 2 Aug 2007 12:27:34 -0000 1.3
@@ -22,7 +22,7 @@
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = ${YEAR}${MONTH}${DAY}
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell find . -name "*.patch") savedattlist.inc open_savedattlist_win.js
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fbview-kronolith.spec 2 Aug 2007 10:35:19 -0000 1.3
+++ fbview-kronolith.spec 2 Aug 2007 12:27:34 -0000 1.4
@@ -3,7 +3,7 @@
%define V_package fbview-%{V_horde_name}
%define V_year 2007
%define V_month 08
-%define V_day 01
+%define V_day 03
%define V_version 2.1.5.99
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
@@ -26,6 +26,18 @@
Source2: conf.php
Source3: prefs.php
+##################################################
+# PATCH COMMENT
+#
+# This allows to display extended parameters (like the event
+# summary) in the fbview and to store a list of attendees in the
+# preferences
+Source4: savedattlist.php
+Source5: savedattlist.inc
+Source6: open_savedattlist_win.js
+
+Patch0: fbview.patch
+
# Build Info
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
@@ -50,6 +62,10 @@
%prep
%setup -c -q
+ cd %{V_horde_name}
+ %patch -p0 -P 0
+ cd ..
+
%build
%install
@@ -59,6 +75,14 @@
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/fbview/
+
+ %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/templates/savedattlist
+ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:4} \
+ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}
+ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:5} \
+ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/templates/savedattlist
+ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:6} \
+ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/templates/javascript
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
From cvs at kolab.org Thu Aug 2 14:28:30 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 14:28:30 +0200 (CEST)
Subject: gunnar: server/horde/fbview-horde conf.php, 1.2, 1.3 fbview-horde.spec,
1.3, 1.4
Message-ID: <20070802122830.AD93660AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv29813/horde/fbview-horde
Modified Files:
conf.php fbview-horde.spec
Log Message:
Fixed fbview configuration. Adjusted release numbers to tomorrow (070803 snapshot will contain todays Horde fixes)
Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/conf.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- conf.php 2 Aug 2007 10:35:19 -0000 1.2
+++ conf.php 2 Aug 2007 12:28:28 -0000 1.3
@@ -10,11 +10,11 @@
$conf['server']['name'] = $_SERVER['SERVER_NAME'];
$conf['server']['port'] = $_SERVER['SERVER_PORT'];
$conf['session']['name'] = 'Horde';
-$conf['session']['use_only_cookies'] = false;
+$conf['session']['use_only_cookies'] = true;
$conf['session']['cache_limiter'] = 'nocache';
-$conf['session']['timeout'] = 3600;
+$conf['session']['timeout'] = 0;
$conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
-$conf['cookie']['path'] = '/horde';
+$conf['cookie']['path'] = '/fbview';
$conf['sql']['phptype'] = false;
$conf['auth']['admins'] = array('manager');
$conf['auth']['checkip'] = true;
@@ -34,7 +34,7 @@
$conf['log']['type'] = 'file';
$conf['log']['enabled'] = true;
$conf['log_accesskeys'] = false;
-$conf['prefs']['driver'] = 'kolab';
+$conf['prefs']['driver'] = 'session';
$conf['alarms']['driver'] = false;
$conf['datatree']['driver'] = 'null';
$conf['group']['driver'] = 'datatree';
Index: fbview-horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fbview-horde.spec 2 Aug 2007 10:35:19 -0000 1.3
+++ fbview-horde.spec 2 Aug 2007 12:28:28 -0000 1.4
@@ -3,7 +3,7 @@
%define V_package fbview-%{V_horde_name}
%define V_year 2007
%define V_month 08
-%define V_day 01
+%define V_day 03
%define V_version 3.1.4.99
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
From cvs at kolab.org Thu Aug 2 14:28:30 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 14:28:30 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework horde-framework-kolab.spec, 1.8,
1.9
Message-ID: <20070802122830.B132060AE44@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv29813/horde/horde-framework
Modified Files:
horde-framework-kolab.spec
Log Message:
Fixed fbview configuration. Adjusted release numbers to tomorrow (070803 snapshot will contain todays Horde fixes)
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- horde-framework-kolab.spec 2 Aug 2007 08:09:48 -0000 1.8
+++ horde-framework-kolab.spec 2 Aug 2007 12:28:28 -0000 1.9
@@ -3,7 +3,7 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
%define V_month 08
-%define V_day 01
+%define V_day 03
%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 Aug 2 15:04:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:42 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview Makefile, 1.7,
NONE kolab-horde-fbview.spec, 1.8, NONE
Message-ID: <20070802130442.6CC9660AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview
In directory doto:/tmp/cvs-serv5048
Removed Files:
Makefile kolab-horde-fbview.spec
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- Makefile DELETED ---
--- kolab-horde-fbview.spec DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:42 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview fbview.conf, 1.1,
NONE
Message-ID: <20070802130442.939B960AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview
Removed Files:
fbview.conf
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- fbview.conf DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:42 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview
.cvsignore, 1.1, NONE COPYING, 1.1, NONE README, 1.1,
NONE index.php, 1.1, NONE login.php, 1.1, NONE rpc.php, 1.1,
NONE signup.php, 1.1, NONE
Message-ID: <20070802130442.A040360AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview
Removed Files:
.cvsignore COPYING README index.php login.php rpc.php
signup.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .cvsignore DELETED ---
--- COPYING DELETED ---
--- README DELETED ---
--- index.php DELETED ---
--- login.php DELETED ---
--- rpc.php DELETED ---
--- signup.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:42 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/admin
cmdshell.php, 1.1, NONE groups.php, 1.1, NONE index.php, 1.1,
NONE phpshell.php, 1.1, NONE sqlshell.php, 1.1,
NONE templates.php, 1.1, NONE user.php, 1.1, NONE
Message-ID: <20070802130442.D50F660AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/admin
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/admin
Removed Files:
cmdshell.php groups.php index.php phpshell.php sqlshell.php
templates.php user.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- cmdshell.php DELETED ---
--- groups.php DELETED ---
--- index.php DELETED ---
--- phpshell.php DELETED ---
--- sqlshell.php DELETED ---
--- templates.php DELETED ---
--- user.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:43 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/admin/perms
addchild.php, 1.1, NONE delete.php, 1.1, NONE edit.php, 1.1,
NONE index.php, 1.1, NONE
Message-ID: <20070802130443.09B1E60AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/admin/perms
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/admin/perms
Removed Files:
addchild.php delete.php edit.php index.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- addchild.php DELETED ---
--- delete.php DELETED ---
--- edit.php DELETED ---
--- index.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:43 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/admin/locale/fi_FI
help.xml, 1.1, NONE
Message-ID: <20070802130443.0120C60AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/admin/locale/fi_FI
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/admin/locale/fi_FI
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:42 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/admin/locale/en_US
help.xml, 1.1, NONE
Message-ID: <20070802130442.F258960AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/admin/locale/en_US
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/admin/locale/en_US
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:43 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/admin/setup
config.php, 1.1, NONE index.php, 1.1, NONE scripts.php, 1.1, NONE
Message-ID: <20070802130443.1358760AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/admin/setup
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/admin/setup
Removed Files:
config.php index.php scripts.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- config.php DELETED ---
--- index.php DELETED ---
--- scripts.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:43 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/config
.cvsignore, 1.1, NONE .htaccess, 1.1, NONE conf.php, 1.1,
NONE conf.php.dist, 1.1, NONE conf.xml, 1.1, NONE hooks.php, 1.1,
NONE hooks.php.dist, 1.1, NONE html.php, 1.1, NONE html.php.dist,
1.1, NONE mime_drivers.php, 1.1, NONE mime_drivers.php.dist, 1.1,
NONE motd.php.dist, 1.1, NONE nls.php, 1.1, NONE nls.php.dist,
1.1, NONE prefs.php, 1.1, NONE prefs.php.dist, 1.1,
NONE registry.php, 1.1, NONE registry.php.dist, 1.1, NONE
Message-ID: <20070802130443.2175860AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/config
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/config
Removed Files:
.cvsignore .htaccess conf.php conf.php.dist conf.xml hooks.php
hooks.php.dist html.php html.php.dist mime_drivers.php
mime_drivers.php.dist motd.php.dist nls.php nls.php.dist
prefs.php prefs.php.dist registry.php registry.php.dist
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .cvsignore DELETED ---
--- .htaccess DELETED ---
--- conf.php DELETED ---
--- conf.php.dist DELETED ---
--- conf.xml DELETED ---
--- hooks.php DELETED ---
--- hooks.php.dist DELETED ---
--- html.php DELETED ---
--- html.php.dist DELETED ---
--- mime_drivers.php DELETED ---
--- mime_drivers.php.dist DELETED ---
--- motd.php.dist DELETED ---
--- nls.php DELETED ---
--- nls.php.dist DELETED ---
--- prefs.php DELETED ---
--- prefs.php.dist DELETED ---
--- registry.php DELETED ---
--- registry.php.dist DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:43 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/docs
CHANGES, 1.1, NONE CODING_STANDARDS, 1.1, NONE CONTRIBUTING, 1.1,
NONE CREDITS, 1.1, NONE HACKING, 1.1, NONE INSTALL, 1.2,
NONE PERFORMANCE, 1.1, NONE RELEASE, 1.1, NONE RELEASE_NOTES,
1.1, NONE SECURITY, 1.1, NONE TODO, 1.1, NONE TRANSLATIONS, 1.1,
NONE UPGRADING, 1.1, NONE
Message-ID: <20070802130443.79DC860AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/docs
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/docs
Removed Files:
CHANGES CODING_STANDARDS CONTRIBUTING CREDITS HACKING INSTALL
PERFORMANCE RELEASE RELEASE_NOTES SECURITY TODO TRANSLATIONS
UPGRADING
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- CHANGES DELETED ---
--- CODING_STANDARDS DELETED ---
--- CONTRIBUTING DELETED ---
--- CREDITS DELETED ---
--- HACKING DELETED ---
--- INSTALL DELETED ---
--- PERFORMANCE DELETED ---
--- RELEASE DELETED ---
--- RELEASE_NOTES DELETED ---
--- SECURITY DELETED ---
--- TODO DELETED ---
--- TRANSLATIONS DELETED ---
--- UPGRADING DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:43 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/config/themes
.cvsignore, 1.1, NONE NeXTgrey.php, 1.1, NONE azur.php, 1.1,
NONE barbie.php, 1.1, NONE bluewhite.php, 1.1, NONE brown.php,
1.1, NONE burntorange.php, 1.1, NONE camouflage.php, 1.1,
NONE cornflower.php, 1.1, NONE gennevilliers.php, 1.1,
NONE green.php, 1.1, NONE grey.php, 1.1, NONE kolab.php, 1.1,
NONE lavender.php, 1.1, NONE lightblue.php, 1.1, NONE luc.php,
1.1, NONE lucblue.php, 1.1, NONE mozilla.php, 1.1,
NONE postnuke.php, 1.1, NONE simplex.php, 1.1, NONE
Message-ID: <20070802130443.2D30B60AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/config/themes
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/config/themes
Removed Files:
.cvsignore NeXTgrey.php azur.php barbie.php bluewhite.php
brown.php burntorange.php camouflage.php cornflower.php
gennevilliers.php green.php grey.php kolab.php lavender.php
lightblue.php luc.php lucblue.php mozilla.php postnuke.php
simplex.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .cvsignore DELETED ---
--- NeXTgrey.php DELETED ---
--- azur.php DELETED ---
--- barbie.php DELETED ---
--- bluewhite.php DELETED ---
--- brown.php DELETED ---
--- burntorange.php DELETED ---
--- camouflage.php DELETED ---
--- cornflower.php DELETED ---
--- gennevilliers.php DELETED ---
--- green.php DELETED ---
--- grey.php DELETED ---
--- kolab.php DELETED ---
--- lavender.php DELETED ---
--- lightblue.php DELETED ---
--- luc.php DELETED ---
--- lucblue.php DELETED ---
--- mozilla.php DELETED ---
--- postnuke.php DELETED ---
--- simplex.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:43 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics
administration.gif, 1.1, NONE az.gif, 1.1, NONE calendar.gif,
1.1, NONE category.gif, 1.1, NONE close.gif, 1.1,
NONE collapse.gif, 1.1, NONE colorpicker.gif, 1.1,
NONE colorpicker.png, 1.1, NONE config.gif, 1.1, NONE cross.gif,
1.1, NONE data.gif, 1.1, NONE delete-small.gif, 1.1,
NONE delete.gif, 1.1, NONE devel.gif, 1.1, NONE download.gif,
1.1, NONE edit.gif, 1.1, NONE expand.gif, 1.1, NONE favicon.ico,
1.1, NONE google.png, 1.1, NONE group.gif, 1.1, NONE guest.gif,
1.1, NONE help.gif, 1.1, NONE horde.gif, 1.1, NONE info.gif, 1.1,
NONE keyboard.gif, 1.1, NONE lhand.gif, 1.1, NONE login.gif, 1.1,
NONE logout.gif, 1.1, NONE mail.gif, 1.1, NONE manual.gif, 1.1,
NONE map.gif, 1.1, NONE myaccount.gif, 1.1, NONE office.gif, 1.1,
NONE perms.gif, 1.1, NONE pim.gif, 1.1, NONE prefs.gif, 1.1,
NONE print.gif, 1.1, NONE private.gif, 1.1, NONE problem.gif,
1.1, NONE reload.gif, 1.1, NONE required.gif, 1.1,
NONE rhand.gif, 1.1, NONE shell.gif, 1.1, NONE sql.gif, 1.1,
NONE tick.gif, 1.1, NONE user.gif
,1.1,NONE webserver.gif,1.1,NONE za.gif,1.1,NONE
Message-ID: <20070802130443.B28C660AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics
Removed Files:
administration.gif az.gif calendar.gif category.gif close.gif
collapse.gif colorpicker.gif colorpicker.png config.gif
cross.gif data.gif delete-small.gif delete.gif devel.gif
download.gif edit.gif expand.gif favicon.ico google.png
group.gif guest.gif help.gif horde.gif info.gif keyboard.gif
lhand.gif login.gif logout.gif mail.gif manual.gif map.gif
myaccount.gif office.gif perms.gif pim.gif prefs.gif print.gif
private.gif problem.gif reload.gif required.gif rhand.gif
shell.gif sql.gif tick.gif user.gif webserver.gif za.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- administration.gif DELETED ---
--- az.gif DELETED ---
--- calendar.gif DELETED ---
--- category.gif DELETED ---
--- close.gif DELETED ---
--- collapse.gif DELETED ---
--- colorpicker.gif DELETED ---
--- colorpicker.png DELETED ---
--- config.gif DELETED ---
--- cross.gif DELETED ---
--- data.gif DELETED ---
--- delete-small.gif DELETED ---
--- delete.gif DELETED ---
--- devel.gif DELETED ---
--- download.gif DELETED ---
--- edit.gif DELETED ---
--- expand.gif DELETED ---
--- favicon.ico DELETED ---
--- google.png DELETED ---
--- group.gif DELETED ---
--- guest.gif DELETED ---
--- help.gif DELETED ---
--- horde.gif DELETED ---
--- info.gif DELETED ---
--- keyboard.gif DELETED ---
--- lhand.gif DELETED ---
--- login.gif DELETED ---
--- logout.gif DELETED ---
--- mail.gif DELETED ---
--- manual.gif DELETED ---
--- map.gif DELETED ---
--- myaccount.gif DELETED ---
--- office.gif DELETED ---
--- perms.gif DELETED ---
--- pim.gif DELETED ---
--- prefs.gif DELETED ---
--- print.gif DELETED ---
--- private.gif DELETED ---
--- problem.gif DELETED ---
--- reload.gif DELETED ---
--- required.gif DELETED ---
--- rhand.gif DELETED ---
--- shell.gif DELETED ---
--- sql.gif DELETED ---
--- tick.gif DELETED ---
--- user.gif DELETED ---
--- webserver.gif DELETED ---
--- za.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:43 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/block
add.gif, 1.1, NONE down.gif, 1.1, NONE large_down.gif, 1.1,
NONE large_left.gif, 1.1, NONE large_right.gif, 1.1,
NONE large_up.gif, 1.1, NONE left.gif, 1.1, NONE right.gif, 1.1,
NONE up.gif, 1.1, NONE
Message-ID: <20070802130443.EAEA560AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/block
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/block
Removed Files:
add.gif down.gif large_down.gif large_left.gif large_right.gif
large_up.gif left.gif right.gif up.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- add.gif DELETED ---
--- down.gif DELETED ---
--- large_down.gif DELETED ---
--- large_left.gif DELETED ---
--- large_right.gif DELETED ---
--- large_up.gif DELETED ---
--- left.gif DELETED ---
--- right.gif DELETED ---
--- up.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:44 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/block/moon
firstquarter.gif, 1.1, NONE fullmoon.gif, 1.1,
NONE lastquarter.gif, 1.1, NONE newmoon.gif, 1.1, NONE
Message-ID: <20070802130444.0703D60AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/block/moon
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/block/moon
Removed Files:
firstquarter.gif fullmoon.gif lastquarter.gif newmoon.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- firstquarter.gif DELETED ---
--- fullmoon.gif DELETED ---
--- lastquarter.gif DELETED ---
--- newmoon.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:43 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/alerts
error.gif, 1.1, NONE message.gif, 1.1, NONE success.gif, 1.1,
NONE warning.gif, 1.1, NONE
Message-ID: <20070802130443.E08F960AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/alerts
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/alerts
Removed Files:
error.gif message.gif success.gif warning.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- error.gif DELETED ---
--- message.gif DELETED ---
--- success.gif DELETED ---
--- warning.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:44 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/block/weatherdotcom/32x32
0.png, 1.1, NONE 1.png, 1.1, NONE 10.png, 1.1, NONE 11.png, 1.1,
NONE 12.png, 1.1, NONE 13.png, 1.1, NONE 14.png, 1.1,
NONE 15.png, 1.1, NONE 16.png, 1.1, NONE 17.png, 1.1,
NONE 18.png, 1.1, NONE 19.png, 1.1, NONE 2.png, 1.1, NONE 20.png,
1.1, NONE 21.png, 1.1, NONE 22.png, 1.1, NONE 23.png, 1.1,
NONE 24.png, 1.1, NONE 25.png, 1.1, NONE 26.png, 1.1,
NONE 27.png, 1.1, NONE 28.png, 1.1, NONE 29.png, 1.1, NONE 3.png,
1.1, NONE 30.png, 1.1, NONE 31.png, 1.1, NONE 32.png, 1.1,
NONE 33.png, 1.1, NONE 34.png, 1.1, NONE 35.png, 1.1,
NONE 36.png, 1.1, NONE 37.png, 1.1, NONE 38.png, 1.1,
NONE 39.png, 1.1, NONE 4.png, 1.1, NONE 40.png, 1.1, NONE 41.png,
1.1, NONE 42.png, 1.1, NONE 43.png, 1.1, NONE 44.png, 1.1,
NONE 45.png, 1.1, NONE 46.png, 1.1, NONE 47.png, 1.1, NONE 5.png,
1.1, NONE 6.png, 1.1, NONE 7.png, 1.1, NONE 8.png, 1.1,
NONE 9.png, 1.1, NONE TWClogo_32px.png, 1.1, NONE na.png, 1.1, NONE
Message-ID: <20070802130444.5FCA260AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/block/weatherdotcom/32x32
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/block/weatherdotcom/32x32
Removed Files:
0.png 1.png 10.png 11.png 12.png 13.png 14.png 15.png 16.png
17.png 18.png 19.png 2.png 20.png 21.png 22.png 23.png 24.png
25.png 26.png 27.png 28.png 29.png 3.png 30.png 31.png 32.png
33.png 34.png 35.png 36.png 37.png 38.png 39.png 4.png 40.png
41.png 42.png 43.png 44.png 45.png 46.png 47.png 5.png 6.png
7.png 8.png 9.png TWClogo_32px.png na.png
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- 0.png DELETED ---
--- 1.png DELETED ---
--- 10.png DELETED ---
--- 11.png DELETED ---
--- 12.png DELETED ---
--- 13.png DELETED ---
--- 14.png DELETED ---
--- 15.png DELETED ---
--- 16.png DELETED ---
--- 17.png DELETED ---
--- 18.png DELETED ---
--- 19.png DELETED ---
--- 2.png DELETED ---
--- 20.png DELETED ---
--- 21.png DELETED ---
--- 22.png DELETED ---
--- 23.png DELETED ---
--- 24.png DELETED ---
--- 25.png DELETED ---
--- 26.png DELETED ---
--- 27.png DELETED ---
--- 28.png DELETED ---
--- 29.png DELETED ---
--- 3.png DELETED ---
--- 30.png DELETED ---
--- 31.png DELETED ---
--- 32.png DELETED ---
--- 33.png DELETED ---
--- 34.png DELETED ---
--- 35.png DELETED ---
--- 36.png DELETED ---
--- 37.png DELETED ---
--- 38.png DELETED ---
--- 39.png DELETED ---
--- 4.png DELETED ---
--- 40.png DELETED ---
--- 41.png DELETED ---
--- 42.png DELETED ---
--- 43.png DELETED ---
--- 44.png DELETED ---
--- 45.png DELETED ---
--- 46.png DELETED ---
--- 47.png DELETED ---
--- 5.png DELETED ---
--- 6.png DELETED ---
--- 7.png DELETED ---
--- 8.png DELETED ---
--- 9.png DELETED ---
--- TWClogo_32px.png DELETED ---
--- na.png DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:44 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/block/weatherdotcom/23x23
0.png, 1.1, NONE 1.png, 1.1, NONE 10.png, 1.1, NONE 11.png, 1.1,
NONE 12.png, 1.1, NONE 13.png, 1.1, NONE 14.png, 1.1,
NONE 15.png, 1.1, NONE 16.png, 1.1, NONE 17.png, 1.1,
NONE 18.png, 1.1, NONE 19.png, 1.1, NONE 2.png, 1.1, NONE 20.png,
1.1, NONE 21.png, 1.1, NONE 22.png, 1.1, NONE 23.png, 1.1,
NONE 24.png, 1.1, NONE 25.png, 1.1, NONE 26.png, 1.1,
NONE 27.png, 1.1, NONE 28.png, 1.1, NONE 29.png, 1.1, NONE 3.png,
1.1, NONE 30.png, 1.1, NONE 31.png, 1.1, NONE 32.png, 1.1,
NONE 33.png, 1.1, NONE 34.png, 1.1, NONE 35.png, 1.1,
NONE 36.png, 1.1, NONE 37.png, 1.1, NONE 38.png, 1.1,
NONE 39.png, 1.1, NONE 4.png, 1.1, NONE 40.png, 1.1, NONE 41.png,
1.1, NONE 42.png, 1.1, NONE 43.png, 1.1, NONE 44.png, 1.1,
NONE 45.png, 1.1, NONE 46.png, 1.1, NONE 47.png, 1.1, NONE 5.png,
1.1, NONE 6.png, 1.1, NONE 7.png, 1.1, NONE 8.png, 1.1,
NONE 9.png, 1.1, NONE na.png, 1.1, NONE
Message-ID: <20070802130444.1E64D60AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/block/weatherdotcom/23x23
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/block/weatherdotcom/23x23
Removed Files:
0.png 1.png 10.png 11.png 12.png 13.png 14.png 15.png 16.png
17.png 18.png 19.png 2.png 20.png 21.png 22.png 23.png 24.png
25.png 26.png 27.png 28.png 29.png 3.png 30.png 31.png 32.png
33.png 34.png 35.png 36.png 37.png 38.png 39.png 4.png 40.png
41.png 42.png 43.png 44.png 45.png 46.png 47.png 5.png 6.png
7.png 8.png 9.png na.png
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- 0.png DELETED ---
--- 1.png DELETED ---
--- 10.png DELETED ---
--- 11.png DELETED ---
--- 12.png DELETED ---
--- 13.png DELETED ---
--- 14.png DELETED ---
--- 15.png DELETED ---
--- 16.png DELETED ---
--- 17.png DELETED ---
--- 18.png DELETED ---
--- 19.png DELETED ---
--- 2.png DELETED ---
--- 20.png DELETED ---
--- 21.png DELETED ---
--- 22.png DELETED ---
--- 23.png DELETED ---
--- 24.png DELETED ---
--- 25.png DELETED ---
--- 26.png DELETED ---
--- 27.png DELETED ---
--- 28.png DELETED ---
--- 29.png DELETED ---
--- 3.png DELETED ---
--- 30.png DELETED ---
--- 31.png DELETED ---
--- 32.png DELETED ---
--- 33.png DELETED ---
--- 34.png DELETED ---
--- 35.png DELETED ---
--- 36.png DELETED ---
--- 37.png DELETED ---
--- 38.png DELETED ---
--- 39.png DELETED ---
--- 4.png DELETED ---
--- 40.png DELETED ---
--- 41.png DELETED ---
--- 42.png DELETED ---
--- 43.png DELETED ---
--- 44.png DELETED ---
--- 45.png DELETED ---
--- 46.png DELETED ---
--- 47.png DELETED ---
--- 5.png DELETED ---
--- 6.png DELETED ---
--- 7.png DELETED ---
--- 8.png DELETED ---
--- 9.png DELETED ---
--- na.png DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:44 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/block/sunrise
sunrise.gif, 1.1, NONE sunset.gif, 1.1, NONE
Message-ID: <20070802130444.0A06560AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/block/sunrise
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/block/sunrise
Removed Files:
sunrise.gif sunset.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- sunrise.gif DELETED ---
--- sunset.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:44 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/emoticons
angel.gif, 1.1, NONE angelwink.gif, 1.1, NONE angry.gif, 1.1,
NONE annoyed.gif, 1.1, NONE asleep.gif, 1.1, NONE bigfrown.gif,
1.1, NONE biggrin.gif, 1.1, NONE blush.gif, 1.1, NONE clown.gif,
1.1, NONE confused.gif, 1.1, NONE cool.gif, 1.1,
NONE coolgrin.gif, 1.1, NONE cooltongue.gif, 1.1, NONE dazed.gif,
1.1, NONE devil.gif, 1.1, NONE deviltongue.gif, 1.1,
NONE disappointed.gif, 1.1, NONE embarrassed.gif, 1.1,
NONE enraged.gif, 1.1, NONE frown.gif, 1.1, NONE frustrated.gif,
1.1, NONE grin.gif, 1.1, NONE hangover.gif, 1.1, NONE hippie.gif,
1.1, NONE hippiegrin.gif, 1.1, NONE hippietongue.gif, 1.1,
NONE hurt.gif, 1.1, NONE indifferent.gif, 1.1, NONE love.gif,
1.1, NONE mad.gif, 1.1, NONE mrt.gif, 1.1, NONE punk.gif, 1.1,
NONE punkmohawk.gif, 1.1, NONE punktongue.gif, 1.1,
NONE raspberry.gif, 1.1, NONE sad.gif, 1.1, NONE shout.gif, 1.1,
NONE smile.gif, 1.1, NONE tired.gif, 1.1, NONE tongueout.gif,
1.1, NONE vampire.gif, 1.1, NONE wink.gif, 1.1,
NONE winkgrin.gif, 1.1, NONE win
ktongue.gif,1.1,NONE winktongueout.gif,1.1,NONE worried.gif,1.1,NONE
Message-ID: <20070802130444.BBDB160AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/emoticons
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/emoticons
Removed Files:
angel.gif angelwink.gif angry.gif annoyed.gif asleep.gif
bigfrown.gif biggrin.gif blush.gif clown.gif confused.gif
cool.gif coolgrin.gif cooltongue.gif dazed.gif devil.gif
deviltongue.gif disappointed.gif embarrassed.gif enraged.gif
frown.gif frustrated.gif grin.gif hangover.gif hippie.gif
hippiegrin.gif hippietongue.gif hurt.gif indifferent.gif
love.gif mad.gif mrt.gif punk.gif punkmohawk.gif
punktongue.gif raspberry.gif sad.gif shout.gif smile.gif
tired.gif tongueout.gif vampire.gif wink.gif winkgrin.gif
winktongue.gif winktongueout.gif worried.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- angel.gif DELETED ---
--- angelwink.gif DELETED ---
--- angry.gif DELETED ---
--- annoyed.gif DELETED ---
--- asleep.gif DELETED ---
--- bigfrown.gif DELETED ---
--- biggrin.gif DELETED ---
--- blush.gif DELETED ---
--- clown.gif DELETED ---
--- confused.gif DELETED ---
--- cool.gif DELETED ---
--- coolgrin.gif DELETED ---
--- cooltongue.gif DELETED ---
--- dazed.gif DELETED ---
--- devil.gif DELETED ---
--- deviltongue.gif DELETED ---
--- disappointed.gif DELETED ---
--- embarrassed.gif DELETED ---
--- enraged.gif DELETED ---
--- frown.gif DELETED ---
--- frustrated.gif DELETED ---
--- grin.gif DELETED ---
--- hangover.gif DELETED ---
--- hippie.gif DELETED ---
--- hippiegrin.gif DELETED ---
--- hippietongue.gif DELETED ---
--- hurt.gif DELETED ---
--- indifferent.gif DELETED ---
--- love.gif DELETED ---
--- mad.gif DELETED ---
--- mrt.gif DELETED ---
--- punk.gif DELETED ---
--- punkmohawk.gif DELETED ---
--- punktongue.gif DELETED ---
--- raspberry.gif DELETED ---
--- sad.gif DELETED ---
--- shout.gif DELETED ---
--- smile.gif DELETED ---
--- tired.gif DELETED ---
--- tongueout.gif DELETED ---
--- vampire.gif DELETED ---
--- wink.gif DELETED ---
--- winkgrin.gif DELETED ---
--- winktongue.gif DELETED ---
--- winktongueout.gif DELETED ---
--- worried.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:44 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/editor
about.gif, 1.1, NONE block.gif, 1.1, NONE bold.gif, 1.1,
NONE bullist.gif, 1.1, NONE center.gif, 1.1, NONE color_fill.gif,
1.1, NONE color_text.gif, 1.1, NONE copy.gif, 1.1, NONE cut.gif,
1.1, NONE ed_about.gif, 1.1, NONE ed_align_center.gif, 1.1,
NONE ed_align_justify.gif, 1.1, NONE ed_align_left.gif, 1.1,
NONE ed_align_right.gif, 1.1, NONE ed_blank.gif, 1.1,
NONE ed_charmap.gif, 1.1, NONE ed_color_bg.gif, 1.1,
NONE ed_color_fg.gif, 1.1, NONE ed_copy.gif, 1.1,
NONE ed_custom.gif, 1.1, NONE ed_cut.gif, 1.1,
NONE ed_delete.gif, 1.1, NONE ed_format_bold.gif, 1.1,
NONE ed_format_italic.gif, 1.1, NONE ed_format_strike.gif, 1.1,
NONE ed_format_sub.gif, 1.1, NONE ed_format_sup.gif, 1.1,
NONE ed_format_underline.gif, 1.1, NONE ed_help.gif, 1.1,
NONE ed_hr.gif, 1.1, NONE ed_html.gif, 1.1, NONE ed_image.gif,
1.1, NONE ed_indent_less.gif, 1.1, NONE ed_indent_more.gif, 1.1,
NONE ed_link.gif, 1.1, NONE ed_list_bullet.gif, 1.1,
NONE ed_list_num.gif, 1.1, NONE ed_paste.gif, 1.1, N
ONE ed_redo.gif, 1.1, NONE ed_show_border.gif, 1.1, NONE ed_splitcel.gif,
1.1, NONE ed_undo.gif, 1.1, NONE fullscreen_maximize.gif, 1.1,
NONE fullscreen_minimize.gif, 1.1, NONE indent.gif, 1.1,
NONE ins_char.gif, 1.1, NONE ins_image.gif, 1.1,
NONE ins_link.gif, 1.1, NONE ins_sub.gif, 1.1, NONE ins_sup.gif,
1.1, NONE ins_table.gif, 1.1, NONE insert_table.gif, 1.1,
NONE italic.gif, 1.1, NONE left.gif, 1.1, NONE numlist.gif, 1.1,
NONE outdent.gif, 1.1, NONE paste.gif, 1.1, NONE redo.gif, 1.1,
NONE rem_formatting.gif, 1.1, NONE rem_link.gif, 1.1,
NONE right.gif, 1.1, NONE rule.gif, 1.1, NONE select_all.gif,
1.1, NONE spacer.gif, 1.1, NONE spell.gif, 1.1,
NONE strikethrough.gif, 1.1, NONE underline.gif, 1.1,
NONE undo.gif, 1.1, NONE
Message-ID: <20070802130444.8287160AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/editor
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/editor
Removed Files:
about.gif block.gif bold.gif bullist.gif center.gif
color_fill.gif color_text.gif copy.gif cut.gif ed_about.gif
ed_align_center.gif ed_align_justify.gif ed_align_left.gif
ed_align_right.gif ed_blank.gif ed_charmap.gif ed_color_bg.gif
ed_color_fg.gif ed_copy.gif ed_custom.gif ed_cut.gif
ed_delete.gif ed_format_bold.gif ed_format_italic.gif
ed_format_strike.gif ed_format_sub.gif ed_format_sup.gif
ed_format_underline.gif ed_help.gif ed_hr.gif ed_html.gif
ed_image.gif ed_indent_less.gif ed_indent_more.gif ed_link.gif
ed_list_bullet.gif ed_list_num.gif ed_paste.gif ed_redo.gif
ed_show_border.gif ed_splitcel.gif ed_undo.gif
fullscreen_maximize.gif fullscreen_minimize.gif indent.gif
ins_char.gif ins_image.gif ins_link.gif ins_sub.gif
ins_sup.gif ins_table.gif insert_table.gif italic.gif left.gif
numlist.gif outdent.gif paste.gif redo.gif rem_formatting.gif
rem_link.gif right.gif rule.gif select_all.gif spacer.gif
spell.gif strikethrough.gif underline.gif undo.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- about.gif DELETED ---
--- block.gif DELETED ---
--- bold.gif DELETED ---
--- bullist.gif DELETED ---
--- center.gif DELETED ---
--- color_fill.gif DELETED ---
--- color_text.gif DELETED ---
--- copy.gif DELETED ---
--- cut.gif DELETED ---
--- ed_about.gif DELETED ---
--- ed_align_center.gif DELETED ---
--- ed_align_justify.gif DELETED ---
--- ed_align_left.gif DELETED ---
--- ed_align_right.gif DELETED ---
--- ed_blank.gif DELETED ---
--- ed_charmap.gif DELETED ---
--- ed_color_bg.gif DELETED ---
--- ed_color_fg.gif DELETED ---
--- ed_copy.gif DELETED ---
--- ed_custom.gif DELETED ---
--- ed_cut.gif DELETED ---
--- ed_delete.gif DELETED ---
--- ed_format_bold.gif DELETED ---
--- ed_format_italic.gif DELETED ---
--- ed_format_strike.gif DELETED ---
--- ed_format_sub.gif DELETED ---
--- ed_format_sup.gif DELETED ---
--- ed_format_underline.gif DELETED ---
--- ed_help.gif DELETED ---
--- ed_hr.gif DELETED ---
--- ed_html.gif DELETED ---
--- ed_image.gif DELETED ---
--- ed_indent_less.gif DELETED ---
--- ed_indent_more.gif DELETED ---
--- ed_link.gif DELETED ---
--- ed_list_bullet.gif DELETED ---
--- ed_list_num.gif DELETED ---
--- ed_paste.gif DELETED ---
--- ed_redo.gif DELETED ---
--- ed_show_border.gif DELETED ---
--- ed_splitcel.gif DELETED ---
--- ed_undo.gif DELETED ---
--- fullscreen_maximize.gif DELETED ---
--- fullscreen_minimize.gif DELETED ---
--- indent.gif DELETED ---
--- ins_char.gif DELETED ---
--- ins_image.gif DELETED ---
--- ins_link.gif DELETED ---
--- ins_sub.gif DELETED ---
--- ins_sup.gif DELETED ---
--- ins_table.gif DELETED ---
--- insert_table.gif DELETED ---
--- italic.gif DELETED ---
--- left.gif DELETED ---
--- numlist.gif DELETED ---
--- outdent.gif DELETED ---
--- paste.gif DELETED ---
--- redo.gif DELETED ---
--- rem_formatting.gif DELETED ---
--- rem_link.gif DELETED ---
--- right.gif DELETED ---
--- rule.gif DELETED ---
--- select_all.gif DELETED ---
--- spacer.gif DELETED ---
--- spell.gif DELETED ---
--- strikethrough.gif DELETED ---
--- underline.gif DELETED ---
--- undo.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/mobile
bottom.jpg, 1.1, NONE display.jpg, 1.1, NONE left.jpg, 1.1,
NONE right.jpg, 1.1, NONE top.jpg, 1.1, NONE
Message-ID: <20070802130445.82C2660AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/mobile
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/mobile
Removed Files:
bottom.jpg display.jpg left.jpg right.jpg top.jpg
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- bottom.jpg DELETED ---
--- display.jpg DELETED ---
--- left.jpg DELETED ---
--- right.jpg DELETED ---
--- top.jpg DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/flags
af.gif, 1.1, NONE al.gif, 1.1, NONE am.gif, 1.1, NONE an.gif,
1.1, NONE ao.gif, 1.1, NONE ar.gif, 1.1, NONE at.gif, 1.1,
NONE au.gif, 1.1, NONE aw.gif, 1.1, NONE az.gif, 1.1,
NONE ba.gif, 1.1, NONE bb.gif, 1.1, NONE bd.gif, 1.1,
NONE be.gif, 1.1, NONE bf.gif, 1.1, NONE bg.gif, 1.1,
NONE bh.gif, 1.1, NONE bi.gif, 1.1, NONE bj.gif, 1.1,
NONE bm.gif, 1.1, NONE bn.gif, 1.1, NONE bo.gif, 1.1,
NONE br.gif, 1.1, NONE bs.gif, 1.1, NONE bt.gif, 1.1,
NONE bw.gif, 1.1, NONE by.gif, 1.1, NONE bz.gif, 1.1,
NONE ca.gif, 1.1, NONE cf.gif, 1.1, NONE cg.gif, 1.1,
NONE ch.gif, 1.1, NONE ci.gif, 1.1, NONE ck.gif, 1.1,
NONE cl.gif, 1.1, NONE cm.gif, 1.1, NONE cn.gif, 1.1,
NONE co.gif, 1.1, NONE cr.gif, 1.1, NONE cu.gif, 1.1,
NONE cv.gif, 1.1, NONE cy.gif, 1.1, NONE cz.gif, 1.1,
NONE de.gif, 1.1, NONE dk.gif, 1.1, NONE dz.gif, 1.1,
NONE ec.gif, 1.1, NONE ee.gif, 1.1, NONE eg.gif, 1.1,
NONE er.gif, 1.1, NONE es.gif, 1.1, NONE et.gif, 1.1,
NONE fi.gif, 1.1, NONE fj.gif, 1.1, NONE fo.gif, 1.1,
NONE fr.gif, 1.1, NONE ga.gif, 1.1
, NONE ge.gif, 1.1, NONE gi.gif, 1.1, NONE gl.gif, 1.1, NONE gp.gif, 1.1,
NONE gr.gif, 1.1, NONE gs.gif, 1.1, NONE gt.gif, 1.1,
NONE gu.gif, 1.1, NONE gy.gif, 1.1, NONE hk.gif, 1.1,
NONE hr.gif, 1.1, NONE ht.gif, 1.1, NONE hu.gif, 1.1,
NONE id.gif, 1.1, NONE ie.gif, 1.1, NONE il.gif, 1.1,
NONE in.gif, 1.1, NONE iq.gif, 1.1, NONE ir.gif, 1.1,
NONE is.gif, 1.1, NONE it.gif, 1.1, NONE jm.gif, 1.1,
NONE jo.gif, 1.1, NONE jp.gif, 1.1, NONE ke.gif, 1.1,
NONE kg.gif, 1.1, NONE kh.gif, 1.1, NONE ki.gif, 1.1,
NONE kp.gif, 1.1, NONE kr.gif, 1.1, NONE ky.gif, 1.1,
NONE kz.gif, 1.1, NONE lb.gif, 1.1, NONE lc.gif, 1.1,
NONE lk.gif, 1.1, NONE lt.gif, 1.1, NONE lu.gif, 1.1,
NONE lv.gif, 1.1, NONE ly.gif, 1.1, NONE ma.gif, 1.1,
NONE mc.gif, 1.1, NONE md.gif, 1.1, NONE mg.gif, 1.1,
NONE mn.gif, 1.1, NONE mo.gif, 1.1, NONE mp.gif, 1.1,
NONE ms.gif, 1.1, NONE mt.gif, 1.1, NONE mx.gif, 1.1,
NONE my.gif, 1.1, NONE mz.gif, 1.1, NONE na.gif, 1.1,
NONE nc.gif, 1.1, NONE nf.gif, 1.1, NONE nl.gif, 1.1,
NONE no.gif, 1.1, NONE np.gif, 1.1, NONE nr.gif, 1.1,
NONE nz.gif, 1.1, NONE om.gif, 1.1, NONE pa.gif, 1.1, NONE pe.gif,
1.1, NONE pf.gif, 1.1, NONE ph.gif, 1.1, NONE pk.gif, 1.1, NONE pl.gif,
1.1, NONE pm.gif, 1.1, NONE pr.gif, 1.1, NONE pt.gif, 1.1,
NONE py.gif, 1.1, NONE qa.gif, 1.1, NONE ro.gif, 1.1,
NONE ru.gif, 1.1, NONE sa.gif, 1.1, NONE sb.gif, 1.1,
NONE sd.gif, 1.1, NONE se.gif, 1.1, NONE sg.gif, 1.1,
NONE si.gif, 1.1, NONE sk.gif, 1.1, NONE sl.gif, 1.1,
NONE so.gif, 1.1, NONE sr.gif, 1.1, NONE sy.gif, 1.1,
NONE tc.gif, 1.1, NONE tg.gif, 1.1, NONE th.gif, 1.1,
NONE tn.gif, 1.1, NONE to.gif, 1.1, NONE tp.gif, 1.1,
NONE tr.gif, 1.1, NONE tt.gif, 1.1, NONE tv.gif, 1.1,
NONE tw.gif, 1.1, NONE tz.gif, 1.1, NONE ua.gif, 1.1,
NONE ug.gif, 1.1, NONE uk.gif, 1.1, NONE us.gif, 1.1,
NONE uy.gif, 1.1, NONE va.gif, 1.1, NONE ve.gif, 1.1,
NONE vg.gif, 1.1, NONE vi.gif, 1.1, NONE vn.gif, 1.1,
NONE wf.gif, 1.1, NONE ws.gif, 1.1, NONE ye.gif, 1.1,
NONE yu.gif, 1.1, NONE za.gif, 1.1, NONE zw.gif, 1.1, NONE
Message-ID: <20070802130445.6022560AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/flags
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/flags
Removed Files:
af.gif al.gif am.gif an.gif ao.gif ar.gif at.gif au.gif aw.gif
az.gif ba.gif bb.gif bd.gif be.gif bf.gif bg.gif bh.gif bi.gif
bj.gif bm.gif bn.gif bo.gif br.gif bs.gif bt.gif bw.gif by.gif
bz.gif ca.gif cf.gif cg.gif ch.gif ci.gif ck.gif cl.gif cm.gif
cn.gif co.gif cr.gif cu.gif cv.gif cy.gif cz.gif de.gif dk.gif
dz.gif ec.gif ee.gif eg.gif er.gif es.gif et.gif fi.gif fj.gif
fo.gif fr.gif ga.gif ge.gif gi.gif gl.gif gp.gif gr.gif gs.gif
gt.gif gu.gif gy.gif hk.gif hr.gif ht.gif hu.gif id.gif ie.gif
il.gif in.gif iq.gif ir.gif is.gif it.gif jm.gif jo.gif jp.gif
ke.gif kg.gif kh.gif ki.gif kp.gif kr.gif ky.gif kz.gif lb.gif
lc.gif lk.gif lt.gif lu.gif lv.gif ly.gif ma.gif mc.gif md.gif
mg.gif mn.gif mo.gif mp.gif ms.gif mt.gif mx.gif my.gif mz.gif
na.gif nc.gif nf.gif nl.gif no.gif np.gif nr.gif nz.gif om.gif
pa.gif pe.gif pf.gif ph.gif pk.gif pl.gif pm.gif pr.gif pt.gif
py.gif qa.gif ro.gif ru.gif sa.gif sb.gif sd.gif se.gif sg.gif
si.gif sk.gif sl.gif so.gif sr.gif sy.gif tc.gif tg.gif th.gif
tn.gif to.gif tp.gif tr.gif tt.gif tv.gif tw.gif tz.gif ua.gif
ug.gif uk.gif us.gif uy.gif va.gif ve.gif vg.gif vi.gif vn.gif
wf.gif ws.gif ye.gif yu.gif za.gif zw.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- af.gif DELETED ---
--- al.gif DELETED ---
--- am.gif DELETED ---
--- an.gif DELETED ---
--- ao.gif DELETED ---
--- ar.gif DELETED ---
--- at.gif DELETED ---
--- au.gif DELETED ---
--- aw.gif DELETED ---
--- az.gif DELETED ---
--- ba.gif DELETED ---
--- bb.gif DELETED ---
--- bd.gif DELETED ---
--- be.gif DELETED ---
--- bf.gif DELETED ---
--- bg.gif DELETED ---
--- bh.gif DELETED ---
--- bi.gif DELETED ---
--- bj.gif DELETED ---
--- bm.gif DELETED ---
--- bn.gif DELETED ---
--- bo.gif DELETED ---
--- br.gif DELETED ---
--- bs.gif DELETED ---
--- bt.gif DELETED ---
--- bw.gif DELETED ---
--- by.gif DELETED ---
--- bz.gif DELETED ---
--- ca.gif DELETED ---
--- cf.gif DELETED ---
--- cg.gif DELETED ---
--- ch.gif DELETED ---
--- ci.gif DELETED ---
--- ck.gif DELETED ---
--- cl.gif DELETED ---
--- cm.gif DELETED ---
--- cn.gif DELETED ---
--- co.gif DELETED ---
--- cr.gif DELETED ---
--- cu.gif DELETED ---
--- cv.gif DELETED ---
--- cy.gif DELETED ---
--- cz.gif DELETED ---
--- de.gif DELETED ---
--- dk.gif DELETED ---
--- dz.gif DELETED ---
--- ec.gif DELETED ---
--- ee.gif DELETED ---
--- eg.gif DELETED ---
--- er.gif DELETED ---
--- es.gif DELETED ---
--- et.gif DELETED ---
--- fi.gif DELETED ---
--- fj.gif DELETED ---
--- fo.gif DELETED ---
--- fr.gif DELETED ---
--- ga.gif DELETED ---
--- ge.gif DELETED ---
--- gi.gif DELETED ---
--- gl.gif DELETED ---
--- gp.gif DELETED ---
--- gr.gif DELETED ---
--- gs.gif DELETED ---
--- gt.gif DELETED ---
--- gu.gif DELETED ---
--- gy.gif DELETED ---
--- hk.gif DELETED ---
--- hr.gif DELETED ---
--- ht.gif DELETED ---
--- hu.gif DELETED ---
--- id.gif DELETED ---
--- ie.gif DELETED ---
--- il.gif DELETED ---
--- in.gif DELETED ---
--- iq.gif DELETED ---
--- ir.gif DELETED ---
--- is.gif DELETED ---
--- it.gif DELETED ---
--- jm.gif DELETED ---
--- jo.gif DELETED ---
--- jp.gif DELETED ---
--- ke.gif DELETED ---
--- kg.gif DELETED ---
--- kh.gif DELETED ---
--- ki.gif DELETED ---
--- kp.gif DELETED ---
--- kr.gif DELETED ---
--- ky.gif DELETED ---
--- kz.gif DELETED ---
--- lb.gif DELETED ---
--- lc.gif DELETED ---
--- lk.gif DELETED ---
--- lt.gif DELETED ---
--- lu.gif DELETED ---
--- lv.gif DELETED ---
--- ly.gif DELETED ---
--- ma.gif DELETED ---
--- mc.gif DELETED ---
--- md.gif DELETED ---
--- mg.gif DELETED ---
--- mn.gif DELETED ---
--- mo.gif DELETED ---
--- mp.gif DELETED ---
--- ms.gif DELETED ---
--- mt.gif DELETED ---
--- mx.gif DELETED ---
--- my.gif DELETED ---
--- mz.gif DELETED ---
--- na.gif DELETED ---
--- nc.gif DELETED ---
--- nf.gif DELETED ---
--- nl.gif DELETED ---
--- no.gif DELETED ---
--- np.gif DELETED ---
--- nr.gif DELETED ---
--- nz.gif DELETED ---
--- om.gif DELETED ---
--- pa.gif DELETED ---
--- pe.gif DELETED ---
--- pf.gif DELETED ---
--- ph.gif DELETED ---
--- pk.gif DELETED ---
--- pl.gif DELETED ---
--- pm.gif DELETED ---
--- pr.gif DELETED ---
--- pt.gif DELETED ---
--- py.gif DELETED ---
--- qa.gif DELETED ---
--- ro.gif DELETED ---
--- ru.gif DELETED ---
--- sa.gif DELETED ---
--- sb.gif DELETED ---
--- sd.gif DELETED ---
--- se.gif DELETED ---
--- sg.gif DELETED ---
--- si.gif DELETED ---
--- sk.gif DELETED ---
--- sl.gif DELETED ---
--- so.gif DELETED ---
--- sr.gif DELETED ---
--- sy.gif DELETED ---
--- tc.gif DELETED ---
--- tg.gif DELETED ---
--- th.gif DELETED ---
--- tn.gif DELETED ---
--- to.gif DELETED ---
--- tp.gif DELETED ---
--- tr.gif DELETED ---
--- tt.gif DELETED ---
--- tv.gif DELETED ---
--- tw.gif DELETED ---
--- tz.gif DELETED ---
--- ua.gif DELETED ---
--- ug.gif DELETED ---
--- uk.gif DELETED ---
--- us.gif DELETED ---
--- uy.gif DELETED ---
--- va.gif DELETED ---
--- ve.gif DELETED ---
--- vg.gif DELETED ---
--- vi.gif DELETED ---
--- vn.gif DELETED ---
--- wf.gif DELETED ---
--- ws.gif DELETED ---
--- ye.gif DELETED ---
--- yu.gif DELETED ---
--- za.gif DELETED ---
--- zw.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/image
flip.png, 1.1, NONE grayscale.gif, 1.1, NONE mirror.png, 1.1,
NONE ratio.png, 1.1, NONE rotate-180.png, 1.1,
NONE rotate-270.png, 1.1, NONE rotate-90.png, 1.1, NONE
Message-ID: <20070802130445.63BE860AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/image
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/image
Removed Files:
flip.png grayscale.gif mirror.png ratio.png rotate-180.png
rotate-270.png rotate-90.png
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- flip.png DELETED ---
--- grayscale.gif DELETED ---
--- mirror.png DELETED ---
--- ratio.png DELETED ---
--- rotate-180.png DELETED ---
--- rotate-270.png DELETED ---
--- rotate-90.png DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/nav
bottom-grey.gif, 1.1, NONE bottom.gif, 1.1, NONE down-grey.gif,
1.1, NONE down.gif, 1.1, NONE first-grey.gif, 1.1,
NONE first.gif, 1.1, NONE last-grey.gif, 1.1, NONE last.gif, 1.1,
NONE left-grey.gif, 1.1, NONE left.gif, 1.1, NONE right-grey.gif,
1.1, NONE right.gif, 1.1, NONE top-grey.gif, 1.1, NONE top.gif,
1.1, NONE up-grey.gif, 1.1, NONE up.gif, 1.1, NONE
Message-ID: <20070802130445.8BE1860AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/nav
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/nav
Removed Files:
bottom-grey.gif bottom.gif down-grey.gif down.gif
first-grey.gif first.gif last-grey.gif last.gif left-grey.gif
left.gif right-grey.gif right.gif top-grey.gif top.gif
up-grey.gif up.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- bottom-grey.gif DELETED ---
--- bottom.gif DELETED ---
--- down-grey.gif DELETED ---
--- down.gif DELETED ---
--- first-grey.gif DELETED ---
--- first.gif DELETED ---
--- last-grey.gif DELETED ---
--- last.gif DELETED ---
--- left-grey.gif DELETED ---
--- left.gif DELETED ---
--- right-grey.gif DELETED ---
--- right.gif DELETED ---
--- top-grey.gif DELETED ---
--- top.gif DELETED ---
--- up-grey.gif DELETED ---
--- up.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/themes/camouflage
menu.gif, 1.1, NONE
Message-ID: <20070802130445.8EC5B60AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/themes/camouflage
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/themes/camouflage
Removed Files:
menu.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- menu.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib
Day.php, 1.1, NONE DayView.php, 1.1, NONE Driver.php, 1.1,
NONE FBView.php, 1.1, NONE Kronolith.php, 1.1, NONE Storage.php,
1.1, NONE WeekView.php, 1.1, NONE api.php, 1.1, NONE base.php,
1.1, NONE prefs.php, 1.1, NONE version.php, 1.1, NONE
Message-ID: <20070802130446.2FC5D60AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/lib
Removed Files:
Day.php DayView.php Driver.php FBView.php Kronolith.php
Storage.php WeekView.php api.php base.php prefs.php
version.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- Day.php DELETED ---
--- DayView.php DELETED ---
--- Driver.php DELETED ---
--- FBView.php DELETED ---
--- Kronolith.php DELETED ---
--- Storage.php DELETED ---
--- WeekView.php DELETED ---
--- api.php DELETED ---
--- base.php DELETED ---
--- prefs.php DELETED ---
--- version.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/themes/lightblue
menu.gif, 1.1, NONE
Message-ID: <20070802130445.9579860AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/themes/lightblue
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/themes/lightblue
Removed Files:
menu.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- menu.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/docs/icalendar/holidays
AUHolidays.ics, 1.1, NONE CanadaHolidays.ics, 1.1,
NONE CzechHolidays.ics, 1.1, NONE Dutch_Holidays_2002-2005.ics,
1.1, NONE FinlandHolidays.ics, 1.1, NONE FrenchHolidays.ics, 1.1,
NONE GermanHolidays.ics, 1.1, NONE JewishHolidays.ics, 1.1,
NONE PolishHolidays.ics, 1.1, NONE SwissHolidays.ics, 1.1,
NONE UKHolidays2002-03.ics, 1.1, NONE USHolidays.ics, 1.1, NONE
Message-ID: <20070802130446.03E1360AE57@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/docs/icalendar/holidays
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/docs/icalendar/holidays
Removed Files:
AUHolidays.ics CanadaHolidays.ics CzechHolidays.ics
Dutch_Holidays_2002-2005.ics FinlandHolidays.ics
FrenchHolidays.ics GermanHolidays.ics JewishHolidays.ics
PolishHolidays.ics SwissHolidays.ics UKHolidays2002-03.ics
USHolidays.ics
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- AUHolidays.ics DELETED ---
--- CanadaHolidays.ics DELETED ---
--- CzechHolidays.ics DELETED ---
--- Dutch_Holidays_2002-2005.ics DELETED ---
--- FinlandHolidays.ics DELETED ---
--- FrenchHolidays.ics DELETED ---
--- GermanHolidays.ics DELETED ---
--- JewishHolidays.ics DELETED ---
--- PolishHolidays.ics DELETED ---
--- SwissHolidays.ics DELETED ---
--- UKHolidays2002-03.ics DELETED ---
--- USHolidays.ics DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/Driver
ical.php, 1.1, NONE kolab.php, 1.1, NONE mcal.php, 1.1,
NONE sql.php, 1.1, NONE
Message-ID: <20070802130446.4342460AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/Driver
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/lib/Driver
Removed Files:
ical.php kolab.php mcal.php sql.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- ical.php DELETED ---
--- kolab.php DELETED ---
--- mcal.php DELETED ---
--- sql.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/themes/mozilla
header.png, 1.1, NONE menu-active.png, 1.1, NONE menu.png, 1.1, NONE
Message-ID: <20070802130445.A0D0B60AE51@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/themes/mozilla
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/themes/mozilla
Removed Files:
header.png menu-active.png menu.png
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- header.png DELETED ---
--- menu-active.png DELETED ---
--- menu.png DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/Block
month.php, 1.1, NONE monthlist.php, 1.1, NONE prevmonthlist.php,
1.1, NONE summary.php, 1.1, NONE
Message-ID: <20070802130446.309FF60AE4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/Block
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/lib/Block
Removed Files:
month.php monthlist.php prevmonthlist.php summary.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- month.php DELETED ---
--- monthlist.php DELETED ---
--- prevmonthlist.php DELETED ---
--- summary.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/config
.cvsignore, 1.1, NONE .htaccess, 1.1, NONE conf.php, 1.1,
NONE conf.xml, 1.1, NONE html.php, 1.1, NONE html.php.dist, 1.1,
NONE keywords.php.dist, 1.1, NONE menu.php.dist, 1.1,
NONE prefs.php, 1.1, NONE prefs.php.dist, 1.1, NONE
Message-ID: <20070802130445.C6DD260AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/config
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/config
Removed Files:
.cvsignore .htaccess conf.php conf.xml html.php html.php.dist
keywords.php.dist menu.php.dist prefs.php prefs.php.dist
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .cvsignore DELETED ---
--- .htaccess DELETED ---
--- conf.php DELETED ---
--- conf.xml DELETED ---
--- html.php DELETED ---
--- html.php.dist DELETED ---
--- keywords.php.dist DELETED ---
--- menu.php.dist DELETED ---
--- prefs.php DELETED ---
--- prefs.php.dist DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/tree
arrow-collapsed.gif, 1.1, NONE arrow-expanded.gif, 1.1,
NONE blank.gif, 1.1, NONE folder.gif, 1.1, NONE folderopen.gif,
1.1, NONE join.gif, 1.1, NONE joinbottom.gif, 1.1, NONE leaf.gif,
1.1, NONE line.gif, 1.1, NONE minus.gif, 1.1,
NONE minusbottom.gif, 1.1, NONE minusonly.gif, 1.1,
NONE minustop.gif, 1.1, NONE plus.gif, 1.1, NONE plusbottom.gif,
1.1, NONE plusonly.gif, 1.1, NONE plustop.gif, 1.1, NONE
Message-ID: <20070802130445.AC61060AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/tree
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/tree
Removed Files:
arrow-collapsed.gif arrow-expanded.gif blank.gif folder.gif
folderopen.gif join.gif joinbottom.gif leaf.gif line.gif
minus.gif minusbottom.gif minusonly.gif minustop.gif plus.gif
plusbottom.gif plusonly.gif plustop.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- arrow-collapsed.gif DELETED ---
--- arrow-expanded.gif DELETED ---
--- blank.gif DELETED ---
--- folder.gif DELETED ---
--- folderopen.gif DELETED ---
--- join.gif DELETED ---
--- joinbottom.gif DELETED ---
--- leaf.gif DELETED ---
--- line.gif DELETED ---
--- minus.gif DELETED ---
--- minusbottom.gif DELETED ---
--- minusonly.gif DELETED ---
--- minustop.gif DELETED ---
--- plus.gif DELETED ---
--- plusbottom.gif DELETED ---
--- plusonly.gif DELETED ---
--- plustop.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/FBView
day.php, 1.1, NONE month.php, 1.1, NONE week.php, 1.2,
NONE workweek.php, 1.1, NONE
Message-ID: <20070802130446.4406460AE51@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/FBView
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/lib/FBView
Removed Files:
day.php month.php week.php workweek.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- day.php DELETED ---
--- month.php DELETED ---
--- week.php DELETED ---
--- workweek.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/Notification/Listener
status.php, 1.1, NONE
Message-ID: <20070802130446.5945C60AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/Notification/Listener
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/lib/Notification/Listener
Removed Files:
status.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- status.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/mime
audio.gif, 1.1, NONE binary.gif, 1.1, NONE compressed.gif, 1.1,
NONE csv.gif, 1.1, NONE deb.gif, 1.1, NONE encryption.gif, 1.1,
NONE executable.gif, 1.1, NONE html.gif, 1.1, NONE icalendar.gif,
1.1, NONE image.gif, 1.1, NONE inf.gif, 1.1, NONE mail.gif, 1.1,
NONE makefile.gif, 1.1, NONE msexcel.gif, 1.1, NONE msi.gif, 1.1,
NONE msp.gif, 1.1, NONE mspowerpoint.gif, 1.1, NONE msword.gif,
1.1, NONE ooo_calc.gif, 1.1, NONE ooo_draw.gif, 1.1,
NONE ooo_impress.gif, 1.1, NONE ooo_math.gif, 1.1,
NONE ooo_writer.gif, 1.1, NONE pdf.gif, 1.1, NONE php.gif, 1.1,
NONE quicktime.gif, 1.1, NONE readme.gif, 1.1,
NONE realaudio.gif, 1.1, NONE rpm.gif, 1.1, NONE script-asa.gif,
1.1, NONE script-asp.gif, 1.1, NONE script-js.gif, 1.1,
NONE setup.gif, 1.1, NONE signed.gif, 1.1, NONE source-c.gif,
1.1, NONE source-cpp.gif, 1.1, NONE source-h.gif, 1.1,
NONE source-java.gif, 1.1, NONE source-python.gif, 1.1,
NONE text.gif, 1.1, NONE unknown.gif, 1.1, NONE vcard.gif, 1.1,
NONE video.gif, 1.1, NONE xcode .gif,1.1,NONE xml.gif,1.1,NONE
Message-ID: <20070802130445.7E31E60AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/mime
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/mime
Removed Files:
audio.gif binary.gif compressed.gif csv.gif deb.gif
encryption.gif executable.gif html.gif icalendar.gif image.gif
inf.gif mail.gif makefile.gif msexcel.gif msi.gif msp.gif
mspowerpoint.gif msword.gif ooo_calc.gif ooo_draw.gif
ooo_impress.gif ooo_math.gif ooo_writer.gif pdf.gif php.gif
quicktime.gif readme.gif realaudio.gif rpm.gif script-asa.gif
script-asp.gif script-js.gif setup.gif signed.gif source-c.gif
source-cpp.gif source-h.gif source-java.gif source-python.gif
text.gif unknown.gif vcard.gif video.gif xcode.gif xml.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- audio.gif DELETED ---
--- binary.gif DELETED ---
--- compressed.gif DELETED ---
--- csv.gif DELETED ---
--- deb.gif DELETED ---
--- encryption.gif DELETED ---
--- executable.gif DELETED ---
--- html.gif DELETED ---
--- icalendar.gif DELETED ---
--- image.gif DELETED ---
--- inf.gif DELETED ---
--- mail.gif DELETED ---
--- makefile.gif DELETED ---
--- msexcel.gif DELETED ---
--- msi.gif DELETED ---
--- msp.gif DELETED ---
--- mspowerpoint.gif DELETED ---
--- msword.gif DELETED ---
--- ooo_calc.gif DELETED ---
--- ooo_draw.gif DELETED ---
--- ooo_impress.gif DELETED ---
--- ooo_math.gif DELETED ---
--- ooo_writer.gif DELETED ---
--- pdf.gif DELETED ---
--- php.gif DELETED ---
--- quicktime.gif DELETED ---
--- readme.gif DELETED ---
--- realaudio.gif DELETED ---
--- rpm.gif DELETED ---
--- script-asa.gif DELETED ---
--- script-asp.gif DELETED ---
--- script-js.gif DELETED ---
--- setup.gif DELETED ---
--- signed.gif DELETED ---
--- source-c.gif DELETED ---
--- source-cpp.gif DELETED ---
--- source-h.gif DELETED ---
--- source-java.gif DELETED ---
--- source-python.gif DELETED ---
--- text.gif DELETED ---
--- unknown.gif DELETED ---
--- vcard.gif DELETED ---
--- video.gif DELETED ---
--- xcode.gif DELETED ---
--- xml.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/themes/simplex
background.gif, 1.1, NONE
Message-ID: <20070802130445.A4E9160AE52@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/themes/simplex
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/themes/simplex
Removed Files:
background.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- background.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/config/themes
html-bluewhite.php, 1.1, NONE html-simplex.php, 1.1, NONE
Message-ID: <20070802130445.C7C1060AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/config/themes
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/config/themes
Removed Files:
html-bluewhite.php html-simplex.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- html-bluewhite.php DELETED ---
--- html-simplex.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/themes/kolab
kolab.gif, 1.1, NONE menu.gif, 1.1, NONE
Message-ID: <20070802130445.8F9CF60AE4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/graphics/themes/kolab
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/graphics/themes/kolab
Removed Files:
kolab.gif menu.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kolab.gif DELETED ---
--- menu.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/docs/icalendar
README, 1.1, NONE chuck.ics, 1.1, NONE exchange.ics, 1.1,
NONE test.ics, 1.1, NONE
Message-ID: <20070802130445.D2F1960AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/docs/icalendar
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/docs/icalendar
Removed Files:
README chuck.ics exchange.ics test.ics
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- README DELETED ---
--- chuck.ics DELETED ---
--- exchange.ics DELETED ---
--- test.ics DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/docs
CHANGES, 1.1, NONE CREDITS, 1.1, NONE INSTALL, 1.1,
NONE RELEASE_NOTES, 1.1, NONE TODO, 1.1, NONE
Message-ID: <20070802130445.CBF7360AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/docs
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/docs
Removed Files:
CHANGES CREDITS INSTALL RELEASE_NOTES TODO
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- CHANGES DELETED ---
--- CREDITS DELETED ---
--- INSTALL DELETED ---
--- RELEASE_NOTES DELETED ---
--- TODO DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:45 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith
COPYING, 1.1, NONE README, 1.1, NONE attendees.php, 1.1,
NONE attendeescommon.php, 1.1, NONE attendeeshandler.php, 1.1,
NONE attendeesview.php, 1.1, NONE contacts.php, 1.1,
NONE index.php, 1.1, NONE savedattlist.php, 1.1, NONE
Message-ID: <20070802130445.B13E760AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith
Removed Files:
COPYING README attendees.php attendeescommon.php
attendeeshandler.php attendeesview.php contacts.php index.php
savedattlist.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- COPYING DELETED ---
--- README DELETED ---
--- attendees.php DELETED ---
--- attendeescommon.php DELETED ---
--- attendeeshandler.php DELETED ---
--- attendeesview.php DELETED ---
--- contacts.php DELETED ---
--- index.php DELETED ---
--- savedattlist.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/Storage
kolab.php, 1.1, NONE sql.php, 1.1, NONE
Message-ID: <20070802130446.5AC4A60AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/Storage
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/lib/Storage
Removed Files:
kolab.php sql.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kolab.php DELETED ---
--- sql.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/es_ES/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.87A1B60AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/es_ES/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/es_ES/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/da_DK/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.727A560AE4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/da_DK/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/da_DK/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/ar_SY/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.5B8FB60AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/ar_SY/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/ar_SY/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/bg_BG/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.5C4B460AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/bg_BG/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/bg_BG/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/cs_CZ/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.71AF160AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/cs_CZ/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/cs_CZ/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/Scheduler
kronolith.php, 1.1, NONE
Message-ID: <20070802130446.5A05760AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/Scheduler
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/lib/Scheduler
Removed Files:
kronolith.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/fi_FI/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.88EF260AE57@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/fi_FI/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/fi_FI/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/el_GR/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.73FC860AE51@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/el_GR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/el_GR/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/fi_FI
help.xml, 1.1, NONE
Message-ID: <20070802130446.8862260AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/fi_FI
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/fi_FI
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/lt_LT/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.CA8B660AE5D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/lt_LT/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/lt_LT/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/graphics
alarm.gif, 1.1, NONE alarm_small.gif, 1.1, NONE attendees.gif,
1.1, NONE bullet.gif, 1.1, NONE clear.gif, 1.1,
NONE contacts.gif, 1.1, NONE dayview.gif, 1.1, NONE event.gif,
1.1, NONE goto.gif, 1.1, NONE kronolith.gif, 1.1,
NONE monthview.gif, 1.1, NONE new.gif, 1.1, NONE recur.gif, 1.1,
NONE search.gif, 1.1, NONE today.gif, 1.1,
NONE unknown-background.gif, 1.1, NONE weekview.gif, 1.1,
NONE workweekview.gif, 1.1, NONE yearview.gif, 1.1, NONE
Message-ID: <20070802130446.04DA660AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/graphics
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/graphics
Removed Files:
alarm.gif alarm_small.gif attendees.gif bullet.gif clear.gif
contacts.gif dayview.gif event.gif goto.gif kronolith.gif
monthview.gif new.gif recur.gif search.gif today.gif
unknown-background.gif weekview.gif workweekview.gif
yearview.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- alarm.gif DELETED ---
--- alarm_small.gif DELETED ---
--- attendees.gif DELETED ---
--- bullet.gif DELETED ---
--- clear.gif DELETED ---
--- contacts.gif DELETED ---
--- dayview.gif DELETED ---
--- event.gif DELETED ---
--- goto.gif DELETED ---
--- kronolith.gif DELETED ---
--- monthview.gif DELETED ---
--- new.gif DELETED ---
--- recur.gif DELETED ---
--- search.gif DELETED ---
--- today.gif DELETED ---
--- unknown-background.gif DELETED ---
--- weekview.gif DELETED ---
--- workweekview.gif DELETED ---
--- yearview.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/en_US
help.xml, 1.1, NONE
Message-ID: <20070802130446.74BF660AE52@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/en_US
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/en_US
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/ro_RO/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.DAAB660AE63@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/ro_RO/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/ro_RO/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/de_DE/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.733D060AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/de_DE/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/de_DE/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/ru_RU/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.DE05D60AE64@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/ru_RU/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/ru_RU/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/pl_PL/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.D40E260AE61@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/pl_PL/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/pl_PL/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/zh_TW/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.EF10460AE68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/zh_TW/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/zh_TW/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/sv_SE/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.E544360AE66@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/sv_SE/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/sv_SE/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/packaging/redhat
kronolith.README, 1.1, NONE kronolith.conf, 1.1,
NONE kronolith.spec, 1.1, NONE mcal.README, 1.1, NONE mcal.spec,
1.1, NONE
Message-ID: <20070802130447.01EED60AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/packaging/redhat
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/packaging/redhat
Removed Files:
kronolith.README kronolith.conf kronolith.spec mcal.README
mcal.spec
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.README DELETED ---
--- kronolith.conf DELETED ---
--- kronolith.spec DELETED ---
--- mcal.README DELETED ---
--- mcal.spec DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/nb_NO/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.CB4EB60AE5E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/nb_NO/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/nb_NO/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates
category_legend.inc, 1.1, NONE common-header.inc, 1.1, NONE
Message-ID: <20070802130447.324AB60AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates
Removed Files:
category_legend.inc common-header.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- category_legend.inc DELETED ---
--- common-header.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/po
.cvsignore, 1.1, NONE README, 1.1, NONE ar_SY.po, 1.1,
NONE bg_BG.po, 1.1, NONE cs_CZ.po, 1.1, NONE da_DK.po, 1.1,
NONE de_DE.po, 1.1, NONE el_GR.po, 1.1, NONE es_ES.po, 1.1,
NONE fi_FI.po, 1.1, NONE fr_FR.po, 1.1, NONE hu_HU.po, 1.1,
NONE it_IT.po, 1.1, NONE ko_KR.po, 1.1, NONE kronolith.pot, 1.1,
NONE kronolith.pot.orig, 1.1, NONE lt_LT.po, 1.1, NONE nb_NO.po,
1.1, NONE nl_NL.po, 1.1, NONE nn_NO.po, 1.1, NONE pl_PL.po, 1.1,
NONE pt_BR.po, 1.1, NONE ro_RO.po, 1.1, NONE ru_RU.po, 1.1,
NONE sk_SK.po, 1.1, NONE sv_SE.po, 1.1, NONE zh_CN.po, 1.1,
NONE zh_TW.po, 1.1, NONE
Message-ID: <20070802130447.2150060AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/po
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/po
Removed Files:
.cvsignore README ar_SY.po bg_BG.po cs_CZ.po da_DK.po de_DE.po
el_GR.po es_ES.po fi_FI.po fr_FR.po hu_HU.po it_IT.po ko_KR.po
kronolith.pot kronolith.pot.orig lt_LT.po nb_NO.po nl_NL.po
nn_NO.po pl_PL.po pt_BR.po ro_RO.po ru_RU.po sk_SK.po sv_SE.po
zh_CN.po zh_TW.po
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .cvsignore DELETED ---
--- README DELETED ---
--- ar_SY.po DELETED ---
--- bg_BG.po DELETED ---
--- cs_CZ.po DELETED ---
--- da_DK.po DELETED ---
--- de_DE.po DELETED ---
--- el_GR.po DELETED ---
--- es_ES.po DELETED ---
--- fi_FI.po DELETED ---
--- fr_FR.po DELETED ---
--- hu_HU.po DELETED ---
--- it_IT.po DELETED ---
--- ko_KR.po DELETED ---
--- kronolith.pot DELETED ---
--- kronolith.pot.orig DELETED ---
--- lt_LT.po DELETED ---
--- nb_NO.po DELETED ---
--- nl_NL.po DELETED ---
--- nn_NO.po DELETED ---
--- pl_PL.po DELETED ---
--- pt_BR.po DELETED ---
--- ro_RO.po DELETED ---
--- ru_RU.po DELETED ---
--- sk_SK.po DELETED ---
--- sv_SE.po DELETED ---
--- zh_CN.po DELETED ---
--- zh_TW.po DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/nl_NL/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.CC0E560AE5F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/nl_NL/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/nl_NL/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/fr_FR/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.8979460AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/fr_FR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/fr_FR/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/hu_HU
help.xml, 1.1, NONE
Message-ID: <20070802130446.A286960AE59@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/hu_HU
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/hu_HU
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/it_IT/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.A410660AE5B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/it_IT/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/it_IT/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/sk_SK/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.E2E5760AE65@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/sk_SK/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/sk_SK/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/ko_KR/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.B166160AE5C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/ko_KR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/ko_KR/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/savedattlist
savedattlist.inc, 1.1, NONE
Message-ID: <20070802130447.782F460AE5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/savedattlist
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/savedattlist
Removed Files:
savedattlist.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- savedattlist.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/fbview
busyblock.inc, 1.1, NONE busyblock.tpl, 1.1, NONE header.tpl,
1.1, NONE legend.inc, 1.1, NONE meetingblock.inc, 1.1,
NONE meetingblock.tpl, 1.1, NONE row.tpl, 1.1, NONE section.tpl,
1.1, NONE unknownblock.inc, 1.1, NONE unknownblock.tpl, 1.1, NONE
Message-ID: <20070802130447.5618060AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/fbview
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/fbview
Removed Files:
busyblock.inc busyblock.tpl header.tpl legend.inc
meetingblock.inc meetingblock.tpl row.tpl section.tpl
unknownblock.inc unknownblock.tpl
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- busyblock.inc DELETED ---
--- busyblock.tpl DELETED ---
--- header.tpl DELETED ---
--- legend.inc DELETED ---
--- meetingblock.inc DELETED ---
--- meetingblock.tpl DELETED ---
--- row.tpl DELETED ---
--- section.tpl DELETED ---
--- unknownblock.inc DELETED ---
--- unknownblock.tpl DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/prefs
remote_cal_management.inc, 1.1, NONE shareselect.inc, 1.1, NONE
Message-ID: <20070802130447.76A7A60AE57@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/prefs
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/prefs
Removed Files:
remote_cal_management.inc shareselect.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- remote_cal_management.inc DELETED ---
--- shareselect.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/weekView
linesblock.tpl, 1.1, NONE
Message-ID: <20070802130447.841CD60AE52@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/weekView
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/weekView
Removed Files:
linesblock.tpl
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- linesblock.tpl DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale
.htaccess, 1.1, NONE
Message-ID: <20070802130447.CE98960AE6B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale
Removed Files:
.htaccess
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .htaccess DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ar_SY/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.43E0260AE43@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ar_SY/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/ar_SY/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/dayView
busyblock.tpl, 1.1, NONE header.tpl, 1.1, NONE legend.inc, 1.1,
NONE linesblock.tpl, 1.1, NONE meetingblock.tpl, 1.1,
NONE row.tpl, 1.1, NONE section.tpl, 1.1, NONE unknownblock.tpl,
1.1, NONE
Message-ID: <20070802130447.4229F60AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/dayView
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/dayView
Removed Files:
busyblock.tpl header.tpl legend.inc linesblock.tpl
meetingblock.tpl row.tpl section.tpl unknownblock.tpl
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- busyblock.tpl DELETED ---
--- header.tpl DELETED ---
--- legend.inc DELETED ---
--- linesblock.tpl DELETED ---
--- meetingblock.tpl DELETED ---
--- row.tpl DELETED ---
--- section.tpl DELETED ---
--- unknownblock.tpl DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/scripts/drivers
kronolith.oracle.sql, 1.1, NONE kronolith.postgres.sql, 1.1,
NONE kronolith.sql, 1.1, NONE
Message-ID: <20070802130447.2D61060AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/scripts/drivers
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/scripts/drivers
Removed Files:
kronolith.oracle.sql kronolith.postgres.sql kronolith.sql
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.oracle.sql DELETED ---
--- kronolith.postgres.sql DELETED ---
--- kronolith.sql DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/attendees
attendees.inc, 1.1, NONE
Message-ID: <20070802130447.3804560AE56@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/attendees
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/attendees
Removed Files:
attendees.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- attendees.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/contacts
contacts.inc, 1.1, NONE javascript.inc, 1.1, NONE
Message-ID: <20070802130447.3CEB360AE4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/contacts
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/contacts
Removed Files:
contacts.inc javascript.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- contacts.inc DELETED ---
--- javascript.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/hu_HU/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.A351B60AE5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/hu_HU/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/hu_HU/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/javascript
goto.inc, 1.1, NONE open_attendees_win.js, 1.1,
NONE open_savedattlist_win.js, 1.1, NONE
Message-ID: <20070802130447.6F9EE60AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/javascript
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/javascript
Removed Files:
goto.inc open_attendees_win.js open_savedattlist_win.js
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- goto.inc DELETED ---
--- open_attendees_win.js DELETED ---
--- open_savedattlist_win.js DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/bg_BG/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.512E360AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/bg_BG/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/bg_BG/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/pt_BR/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.D786960AE62@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/pt_BR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/pt_BR/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/nn_NO/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.D3FBC60AE60@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/nn_NO/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/nn_NO/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/view
view.inc, 1.1, NONE
Message-ID: <20070802130447.811E960AE51@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/view
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/view
Removed Files:
view.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- view.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/menu
menu.inc, 1.1, NONE
Message-ID: <20070802130447.743FA60AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/menu
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/menu
Removed Files:
menu.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- menu.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/lib
.htaccess, 1.1, NONE Test.php, 1.1, NONE api.php, 1.1,
NONE base.php, 1.1, NONE core.php, 1.1, NONE prefs.php, 1.1,
NONE version.php, 1.1, NONE
Message-ID: <20070802130447.9198F60AE69@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/lib
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/lib
Removed Files:
.htaccess Test.php api.php base.php core.php prefs.php
version.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .htaccess DELETED ---
--- Test.php DELETED ---
--- api.php DELETED ---
--- base.php DELETED ---
--- core.php DELETED ---
--- prefs.php DELETED ---
--- version.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/lib/Block
color.php, 1.1, NONE fortune.php, 1.1, NONE google.php, 1.1,
NONE iframe.php, 1.1, NONE metar.php, 1.1, NONE moon.php, 1.1,
NONE sunrise.php, 1.1, NONE time.php, 1.1,
NONE weatherdotcom.php, 1.1, NONE
Message-ID: <20070802130447.C9BD860AE6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/lib/Block
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/lib/Block
Removed Files:
color.php fortune.php google.php iframe.php metar.php moon.php
sunrise.php time.php weatherdotcom.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- color.php DELETED ---
--- fortune.php DELETED ---
--- google.php DELETED ---
--- iframe.php DELETED ---
--- metar.php DELETED ---
--- moon.php DELETED ---
--- sunrise.php DELETED ---
--- time.php DELETED ---
--- weatherdotcom.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/cs_CZ/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.7E79660AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/cs_CZ/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/cs_CZ/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/bg_BG
help.xml, 1.1, NONE
Message-ID: <20070802130449.4758A60AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/bg_BG
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/bg_BG
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:46 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/zh_CN/LC_MESSAGES
kronolith.mo, 1.1, NONE
Message-ID: <20070802130446.E94A760AE67@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/locale/zh_CN/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/locale/zh_CN/LC_MESSAGES
Removed Files:
kronolith.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- kronolith.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ca_ES/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.5B0BC60AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ca_ES/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/ca_ES/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/cs_CZ
help.xml, 1.1, NONE
Message-ID: <20070802130449.5EC4C60AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/cs_CZ
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/cs_CZ
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/scripts
.htaccess, 1.1, NONE add_meetings.sql, 1.1,
NONE add_meetings_psql.sql, 1.1, NONE convert_categories.php,
1.1, NONE create_default_history.php, 1.1, NONE guid_convert.sql,
1.1, NONE guid_convert_mysql.sql, 1.1, NONE mcal_to_sql.php, 1.1,
NONE reminders.php, 1.1, NONE
Message-ID: <20070802130447.260AF60AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/scripts
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/scripts
Removed Files:
.htaccess add_meetings.sql add_meetings_psql.sql
convert_categories.php create_default_history.php
guid_convert.sql guid_convert_mysql.sql mcal_to_sql.php
reminders.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .htaccess DELETED ---
--- add_meetings.sql DELETED ---
--- add_meetings_psql.sql DELETED ---
--- convert_categories.php DELETED ---
--- create_default_history.php DELETED ---
--- guid_convert.sql DELETED ---
--- guid_convert_mysql.sql DELETED ---
--- mcal_to_sql.php DELETED ---
--- reminders.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/de_DE/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.80EE060AE51@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/de_DE/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/de_DE/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:47 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/workweekView
linesblock.tpl, 1.1, NONE
Message-ID: <20070802130447.857BB60AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/templates/workweekView
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/kronolith/templates/workweekView
Removed Files:
linesblock.tpl
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- linesblock.tpl DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/de_DE
help.xml, 1.1, NONE
Message-ID: <20070802130449.96CF260AE52@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/de_DE
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/de_DE
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/fr_FR
help.xml, 1.1, NONE
Message-ID: <20070802130449.D761C60AE5B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/fr_FR
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/fr_FR
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/fi_FI
help.xml, 1.1, NONE
Message-ID: <20070802130449.AFBD460AE5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/fi_FI
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/fi_FI
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/da_DK/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.7FF8860AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/da_DK/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/da_DK/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/et_EE
help.xml, 1.1, NONE
Message-ID: <20070802130449.AE43F60AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/et_EE
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/et_EE
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/et_EE/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.AF01860AE59@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/et_EE/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/et_EE/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/fr_FR/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.D83A360AE5C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/fr_FR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/fr_FR/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/hu_HU
help.xml, 1.1, NONE
Message-ID: <20070802130449.DB33F60AE5E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/hu_HU
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/hu_HU
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/el_GR
help.xml, 1.1, NONE
Message-ID: <20070802130449.9795060AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/el_GR
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/el_GR
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/es_ES
help.xml, 1.1, NONE
Message-ID: <20070802130449.995A260AE55@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/es_ES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/es_ES
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/id_ID/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.134CE60AE67@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/id_ID/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/id_ID/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/el_GR/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.9852E60AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/el_GR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/el_GR/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/gl_ES/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.D927F60AE5D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/gl_ES/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/gl_ES/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/hu_HU/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.07D8460AE64@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/hu_HU/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/hu_HU/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/da_DK
help.xml, 1.1, NONE
Message-ID: <20070802130449.7F39360AE4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/da_DK
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/da_DK
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/es_ES/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.AD85360AE57@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/es_ES/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/es_ES/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/fi_FI/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130449.D67E260AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/fi_FI/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/fi_FI/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ja_JP
help.xml, 1.1, NONE
Message-ID: <20070802130450.15E7860AE6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ja_JP
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/ja_JP
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/lv_LV/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.2EAF060AE6F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/lv_LV/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/lv_LV/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/it_IT/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.150C760AE69@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/it_IT/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/it_IT/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/lt_LT/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.2DE4960AE6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/lt_LT/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/lt_LT/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:49 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:49 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/en_US
help.xml, 1.1, NONE
Message-ID: <20070802130449.ACC0760AE56@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/en_US
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/en_US
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nb_NO/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.3473E60AE70@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nb_NO/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/nb_NO/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nl_NL
help.xml, 1.1, NONE
Message-ID: <20070802130450.3C5F860AE51@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nl_NL
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/nl_NL
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pl_PL
help.xml, 1.1, NONE
Message-ID: <20070802130450.3FD7E60AE72@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pl_PL
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/pl_PL
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/it_IT
help.xml, 1.1, NONE
Message-ID: <20070802130450.1416660AE68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/it_IT
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/it_IT
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nb_NO
help.xml, 1.1, NONE
Message-ID: <20070802130450.319F160AE4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nb_NO
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/nb_NO
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ko_KR
help.xml, 1.1, NONE
Message-ID: <20070802130450.2C63760AE6C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ko_KR
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/ko_KR
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nn_NO/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.3F0ED60AE71@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nn_NO/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/nn_NO/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pt_PT
help.xml, 1.1, NONE
Message-ID: <20070802130450.4526F60AE74@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pt_PT
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/pt_PT
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pt_BR
help.xml, 1.1, NONE
Message-ID: <20070802130450.42A8D60AE73@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pt_BR
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/pt_BR
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nl_NL/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.3D4D160AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nl_NL/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/nl_NL/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/mk_MK/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.2FD7160AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/mk_MK/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/mk_MK/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sl_SI
help.xml, 1.1, NONE
Message-ID: <20070802130450.6811F60AE7C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sl_SI
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/sl_SI
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sl_SI/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.68D9660AE7D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sl_SI/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/sl_SI/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ko_KR/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.2D22B60AE6D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ko_KR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/ko_KR/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/uk_UA/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.76A9360AE80@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/uk_UA/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/uk_UA/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pl_PL/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.40D3E60AE52@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pl_PL/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/pl_PL/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sv_SE
help.xml, 1.1, NONE
Message-ID: <20070802130450.6997760AE7E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sv_SE
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/sv_SE
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/tr_TR/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.8F82160AE84@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/tr_TR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/tr_TR/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/lt_LT
help.xml, 1.1, NONE
Message-ID: <20070802130450.6497360AE78@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/lt_LT
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/lt_LT
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sk_SK/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.6717560AE7B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sk_SK/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/sk_SK/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/packaging
.htaccess, 1.1, NONE
Message-ID: <20070802130450.A536460AE60@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/packaging
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/packaging
Removed Files:
.htaccess
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .htaccess DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ru_RU
help.xml, 1.1, NONE
Message-ID: <20070802130450.63BE560AE77@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ru_RU
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/ru_RU
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ja_JP/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.2B9F860AE6B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ja_JP/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/ja_JP/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sk_SK
help.xml, 1.1, NONE
Message-ID: <20070802130450.6655760AE7A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sk_SK
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/sk_SK
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:51 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:51 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/po
.cvsignore, 1.1, NONE .htaccess, 1.1, NONE README, 1.1,
NONE ar_SY.po, 1.1, NONE bg_BG.po, 1.1, NONE ca_ES.po, 1.1,
NONE compendium.po, 1.1, NONE cs_CZ.po, 1.1, NONE da_DK.po, 1.1,
NONE de_DE.po, 1.1, NONE el_GR.po, 1.1, NONE es_ES.po, 1.1,
NONE et_EE.po, 1.1, NONE fi_FI.po, 1.1, NONE fr_FR.po, 1.1,
NONE gl_ES.po, 1.1, NONE horde.pot, 1.1, NONE hu_HU.po, 1.1,
NONE id_ID.po, 1.1, NONE it_IT.po, 1.1, NONE ja_JP.po, 1.1,
NONE ko_KR.po, 1.1, NONE lt_LT.po, 1.1, NONE lv_LV.po, 1.1,
NONE messages.mo, 1.1, NONE mk_MK.po, 1.1, NONE nb_NO.po, 1.1,
NONE nl_NL.po, 1.1, NONE nn_NO.po, 1.1, NONE pl_PL.po, 1.1,
NONE pt_BR.po, 1.1, NONE pt_PT.po, 1.1, NONE ro_RO.po, 1.1,
NONE ru_RU.po, 1.1, NONE sk_SK.po, 1.1, NONE sl_SI.po, 1.1,
NONE sv_SE.po, 1.1, NONE tr_TR.po, 1.1, NONE translation.php,
1.2, NONE uk_UA.po, 1.1, NONE zh_CN.po, 1.1, NONE zh_TW.po, 1.1, NONE
Message-ID: <20070802130451.0745060AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/po
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/po
Removed Files:
.cvsignore .htaccess README ar_SY.po bg_BG.po ca_ES.po
compendium.po cs_CZ.po da_DK.po de_DE.po el_GR.po es_ES.po
et_EE.po fi_FI.po fr_FR.po gl_ES.po horde.pot hu_HU.po
id_ID.po it_IT.po ja_JP.po ko_KR.po lt_LT.po lv_LV.po
messages.mo mk_MK.po nb_NO.po nl_NL.po nn_NO.po pl_PL.po
pt_BR.po pt_PT.po ro_RO.po ru_RU.po sk_SK.po sl_SI.po sv_SE.po
tr_TR.po translation.php uk_UA.po zh_CN.po zh_TW.po
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .cvsignore DELETED ---
--- .htaccess DELETED ---
--- README DELETED ---
--- ar_SY.po DELETED ---
--- bg_BG.po DELETED ---
--- ca_ES.po DELETED ---
--- compendium.po DELETED ---
--- cs_CZ.po DELETED ---
--- da_DK.po DELETED ---
--- de_DE.po DELETED ---
--- el_GR.po DELETED ---
--- es_ES.po DELETED ---
--- et_EE.po DELETED ---
--- fi_FI.po DELETED ---
--- fr_FR.po DELETED ---
--- gl_ES.po DELETED ---
--- horde.pot DELETED ---
--- hu_HU.po DELETED ---
--- id_ID.po DELETED ---
--- it_IT.po DELETED ---
--- ja_JP.po DELETED ---
--- ko_KR.po DELETED ---
--- lt_LT.po DELETED ---
--- lv_LV.po DELETED ---
--- messages.mo DELETED ---
--- mk_MK.po DELETED ---
--- nb_NO.po DELETED ---
--- nl_NL.po DELETED ---
--- nn_NO.po DELETED ---
--- pl_PL.po DELETED ---
--- pt_BR.po DELETED ---
--- pt_PT.po DELETED ---
--- ro_RO.po DELETED ---
--- ru_RU.po DELETED ---
--- sk_SK.po DELETED ---
--- sl_SI.po DELETED ---
--- sv_SE.po DELETED ---
--- tr_TR.po DELETED ---
--- translation.php DELETED ---
--- uk_UA.po DELETED ---
--- zh_CN.po DELETED ---
--- zh_TW.po DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pt_PT/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.4CF4A60AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pt_PT/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/pt_PT/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pt_BR/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.6B29860AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/pt_BR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/pt_BR/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ru_RU/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.6560560AE79@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ru_RU/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/ru_RU/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/zh_CN/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.7852C60AE82@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/zh_CN/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/zh_CN/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:52 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services
cacheview.php, 1.1, NONE css.php, 1.1, NONE go.php, 1.1,
NONE javascript.php, 1.1, NONE keyboard.php, 1.1,
NONE language.php, 1.1, NONE maintenance.php, 1.1,
NONE prefs.php, 1.1, NONE problem.php, 1.1,
NONE resetpassword.php, 1.1, NONE
Message-ID: <20070802130452.ECA1760AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services
Removed Files:
cacheview.php css.php go.php javascript.php keyboard.php
language.php maintenance.php prefs.php problem.php
resetpassword.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- cacheview.php DELETED ---
--- css.php DELETED ---
--- go.php DELETED ---
--- javascript.php DELETED ---
--- keyboard.php DELETED ---
--- language.php DELETED ---
--- maintenance.php DELETED ---
--- prefs.php DELETED ---
--- problem.php DELETED ---
--- resetpassword.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:55 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/images
colorpicker.php, 1.1, NONE pixel.php, 1.1, NONE view.php, 1.1, NONE
Message-ID: <20070802130455.59D4560AE52@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/images
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services/images
Removed Files:
colorpicker.php pixel.php view.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- colorpicker.php DELETED ---
--- pixel.php DELETED ---
--- view.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ro_RO/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.4F01560AE75@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/ro_RO/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/ro_RO/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/packaging/redhat
TODO, 1.1, NONE horde.PREREQ, 1.1, NONE horde.README, 1.1,
NONE horde.conf, 1.1, NONE horde.spec, 1.1, NONE libmcrypt.spec,
1.1, NONE rh7-horde.README, 1.1, NONE rh7-php.spec, 1.1,
NONE rh9-horde.spec, 1.1, NONE rh9-php.spec, 1.1, NONE
Message-ID: <20070802130450.9065160AE85@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/packaging/redhat
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/packaging/redhat
Removed Files:
TODO horde.PREREQ horde.README horde.conf horde.spec
libmcrypt.spec rh7-horde.README rh7-php.spec rh9-horde.spec
rh9-php.spec
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- TODO DELETED ---
--- horde.PREREQ DELETED ---
--- horde.README DELETED ---
--- horde.conf DELETED ---
--- horde.spec DELETED ---
--- libmcrypt.spec DELETED ---
--- rh7-horde.README DELETED ---
--- rh7-php.spec DELETED ---
--- rh9-horde.spec DELETED ---
--- rh9-php.spec DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:55 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/shares
edit.php, 1.1, NONE
Message-ID: <20070802130455.A11CC60AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/shares
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services/shares
Removed Files:
edit.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- edit.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:55 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/links
delete.php, 1.1, NONE
Message-ID: <20070802130455.8511F60AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/links
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services/links
Removed Files:
delete.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- delete.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/zh_TW
help.xml, 1.1, NONE
Message-ID: <20070802130450.8D4D360AE56@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/zh_TW
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/zh_TW
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nn_NO
help.xml, 1.1, NONE
Message-ID: <20070802130450.3E15E60AE55@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/nn_NO
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/nn_NO
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:55 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates
.htaccess, 1.1, NONE common-footer.inc, 1.1,
NONE common-header.inc, 1.1, NONE
Message-ID: <20070802130455.A515160AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates
Removed Files:
.htaccess common-footer.inc common-header.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .htaccess DELETED ---
--- common-footer.inc DELETED ---
--- common-header.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sv_SE/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.6CED860AE7F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/sv_SE/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/sv_SE/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:55 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/portal
edit.php, 1.1, NONE index.php, 1.1, NONE menu.php, 1.1,
NONE mobile.php, 1.1, NONE rpcsum.php, 1.1, NONE
Message-ID: <20070802130455.9ED2C60AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/portal
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services/portal
Removed Files:
edit.php index.php menu.php mobile.php rpcsum.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- edit.php DELETED ---
--- index.php DELETED ---
--- menu.php DELETED ---
--- mobile.php DELETED ---
--- rpcsum.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:54 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:54 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/editor/htmlarea
dialog.js, 1.1, NONE htmlarea.css, 1.1, NONE htmlarea.js, 1.1,
NONE popupdiv.js, 1.1, NONE popupwin.js, 1.1, NONE
Message-ID: <20070802130454.26EEB60AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/editor/htmlarea
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services/editor/htmlarea
Removed Files:
dialog.js htmlarea.css htmlarea.js popupdiv.js popupwin.js
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- dialog.js DELETED ---
--- htmlarea.css DELETED ---
--- htmlarea.js DELETED ---
--- popupdiv.js DELETED ---
--- popupwin.js DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:51 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:51 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/scripts
.cvsignore, 1.1, NONE .htaccess, 1.1, NONE SCRIPTS, 1.1,
NONE compare_revisions.sh, 1.1, NONE create-symlinks.php, 1.1,
NONE crond, 1.1, NONE get_ISO3166.php, 1.1, NONE get_login.php,
1.1, NONE horde-rsync.sh, 1.1, NONE http_login_refer.php, 1.1,
NONE make-release-conf.php.dist, 1.1, NONE make-release.php, 1.1,
NONE make-snaps.php, 1.1, NONE merge.php, 1.1,
NONE migrate_categories.php, 1.1, NONE migrate_links.php, 1.1,
NONE migrate_user_categories.php, 1.1, NONE package.dtd, 1.1,
NONE remove_prefs.php, 1.1, NONE rename_category.php, 1.1,
NONE set_perms.sh, 1.1, NONE setup.php, 1.1,
NONE temp-cleanup.cron, 1.1, NONE update_horde.sh, 1.1, NONE
Message-ID: <20070802130451.2BCAE60AE76@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/scripts
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/scripts
Removed Files:
.cvsignore .htaccess SCRIPTS compare_revisions.sh
create-symlinks.php crond get_ISO3166.php get_login.php
horde-rsync.sh http_login_refer.php make-release-conf.php.dist
make-release.php make-snaps.php merge.php
migrate_categories.php migrate_links.php
migrate_user_categories.php package.dtd remove_prefs.php
rename_category.php set_perms.sh setup.php temp-cleanup.cron
update_horde.sh
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .cvsignore DELETED ---
--- .htaccess DELETED ---
--- SCRIPTS DELETED ---
--- compare_revisions.sh DELETED ---
--- create-symlinks.php DELETED ---
--- crond DELETED ---
--- get_ISO3166.php DELETED ---
--- get_login.php DELETED ---
--- horde-rsync.sh DELETED ---
--- http_login_refer.php DELETED ---
--- make-release-conf.php.dist DELETED ---
--- make-release.php DELETED ---
--- make-snaps.php DELETED ---
--- merge.php DELETED ---
--- migrate_categories.php DELETED ---
--- migrate_links.php DELETED ---
--- migrate_user_categories.php DELETED ---
--- package.dtd DELETED ---
--- remove_prefs.php DELETED ---
--- rename_category.php DELETED ---
--- set_perms.sh DELETED ---
--- setup.php DELETED ---
--- temp-cleanup.cron DELETED ---
--- update_horde.sh DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/zh_TW/LC_MESSAGES
horde.mo, 1.1, NONE
Message-ID: <20070802130450.8E53960AE83@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/zh_TW/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/zh_TW/LC_MESSAGES
Removed Files:
horde.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:54 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:54 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/editor/htmlarea/lang
en.js, 1.1, NONE
Message-ID: <20070802130454.888E360AE4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/editor/htmlarea/lang
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services/editor/htmlarea/lang
Removed Files:
en.js
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- en.js DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:54 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:54 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/editor/htmlarea/images
ed_about.gif, 1.1, NONE ed_align_center.gif, 1.1,
NONE ed_align_justify.gif, 1.1, NONE ed_align_left.gif, 1.1,
NONE ed_align_right.gif, 1.1, NONE ed_blank.gif, 1.1,
NONE ed_charmap.gif, 1.1, NONE ed_color_bg.gif, 1.1,
NONE ed_color_fg.gif, 1.1, NONE ed_copy.gif, 1.1,
NONE ed_custom.gif, 1.1, NONE ed_cut.gif, 1.1,
NONE ed_delete.gif, 1.1, NONE ed_format_bold.gif, 1.1,
NONE ed_format_italic.gif, 1.1, NONE ed_format_strike.gif, 1.1,
NONE ed_format_sub.gif, 1.1, NONE ed_format_sup.gif, 1.1,
NONE ed_format_underline.gif, 1.1, NONE ed_help.gif, 1.1,
NONE ed_hr.gif, 1.1, NONE ed_html.gif, 1.1, NONE ed_image.gif,
1.1, NONE ed_indent_less.gif, 1.1, NONE ed_indent_more.gif, 1.1,
NONE ed_left_to_right.gif, 1.1, NONE ed_link.gif, 1.1,
NONE ed_list_bullet.gif, 1.1, NONE ed_list_num.gif, 1.1,
NONE ed_paste.gif, 1.1, NONE ed_redo.gif, 1.1,
NONE ed_right_to_left.gif, 1.1, NONE ed_save.gif, 1.1,
NONE ed_show_border.gif, 1.1, NONE ed_splitcel.gif, 1.1, NONE ed_un
do.gif, 1.1, NONE fullscreen_maximize.gif, 1.1,
NONE fullscreen_minimize.gif, 1.1, NONE insert_table.gif, 1.1, NONE
Message-ID: <20070802130454.865F160AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/editor/htmlarea/images
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services/editor/htmlarea/images
Removed Files:
ed_about.gif ed_align_center.gif ed_align_justify.gif
ed_align_left.gif ed_align_right.gif ed_blank.gif
ed_charmap.gif ed_color_bg.gif ed_color_fg.gif ed_copy.gif
ed_custom.gif ed_cut.gif ed_delete.gif ed_format_bold.gif
ed_format_italic.gif ed_format_strike.gif ed_format_sub.gif
ed_format_sup.gif ed_format_underline.gif ed_help.gif
ed_hr.gif ed_html.gif ed_image.gif ed_indent_less.gif
ed_indent_more.gif ed_left_to_right.gif ed_link.gif
ed_list_bullet.gif ed_list_num.gif ed_paste.gif ed_redo.gif
ed_right_to_left.gif ed_save.gif ed_show_border.gif
ed_splitcel.gif ed_undo.gif fullscreen_maximize.gif
fullscreen_minimize.gif insert_table.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- ed_about.gif DELETED ---
--- ed_align_center.gif DELETED ---
--- ed_align_justify.gif DELETED ---
--- ed_align_left.gif DELETED ---
--- ed_align_right.gif DELETED ---
--- ed_blank.gif DELETED ---
--- ed_charmap.gif DELETED ---
--- ed_color_bg.gif DELETED ---
--- ed_color_fg.gif DELETED ---
--- ed_copy.gif DELETED ---
--- ed_custom.gif DELETED ---
--- ed_cut.gif DELETED ---
--- ed_delete.gif DELETED ---
--- ed_format_bold.gif DELETED ---
--- ed_format_italic.gif DELETED ---
--- ed_format_strike.gif DELETED ---
--- ed_format_sub.gif DELETED ---
--- ed_format_sup.gif DELETED ---
--- ed_format_underline.gif DELETED ---
--- ed_help.gif DELETED ---
--- ed_hr.gif DELETED ---
--- ed_html.gif DELETED ---
--- ed_image.gif DELETED ---
--- ed_indent_less.gif DELETED ---
--- ed_indent_more.gif DELETED ---
--- ed_left_to_right.gif DELETED ---
--- ed_link.gif DELETED ---
--- ed_list_bullet.gif DELETED ---
--- ed_list_num.gif DELETED ---
--- ed_paste.gif DELETED ---
--- ed_redo.gif DELETED ---
--- ed_right_to_left.gif DELETED ---
--- ed_save.gif DELETED ---
--- ed_show_border.gif DELETED ---
--- ed_splitcel.gif DELETED ---
--- ed_undo.gif DELETED ---
--- fullscreen_maximize.gif DELETED ---
--- fullscreen_minimize.gif DELETED ---
--- insert_table.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:51 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:51 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/scripts/mime_mapping
Makefile, 1.1, NONE convert.php, 1.1, NONE mime.globs, 1.1,
NONE mime.types, 1.1, NONE mime.types.horde, 1.1, NONE
Message-ID: <20070802130451.42AC260AE63@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/scripts/mime_mapping
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/scripts/mime_mapping
Removed Files:
Makefile convert.php mime.globs mime.types mime.types.horde
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- Makefile DELETED ---
--- convert.php DELETED ---
--- mime.globs DELETED ---
--- mime.types DELETED ---
--- mime.types.horde DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/uk_UA
help.xml, 1.1, NONE
Message-ID: <20070802130450.75DE960AE57@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/uk_UA
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/uk_UA
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:50 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/zh_CN
help.xml, 1.1, NONE
Message-ID: <20070802130450.7783B60AE81@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/locale/zh_CN
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/locale/zh_CN
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:51 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:51 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/scripts/ldap
horde.schema, 1.1, NONE
Message-ID: <20070802130451.3A40360AE87@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/scripts/ldap
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/scripts/ldap
Removed Files:
horde.schema
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- horde.schema DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:55 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/editor/htmlarea/popups
about.html, 1.1, NONE blank.html, 1.1, NONE fullscreen.html, 1.1,
NONE insert_image.html, 1.1, NONE insert_table.html, 1.1,
NONE link.html, 1.1, NONE popup.js, 1.1, NONE select_color.html,
1.1, NONE
Message-ID: <20070802130455.5503B60AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/editor/htmlarea/popups
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services/editor/htmlarea/popups
Removed Files:
about.html blank.html fullscreen.html insert_image.html
insert_table.html link.html popup.js select_color.html
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- about.html DELETED ---
--- blank.html DELETED ---
--- fullscreen.html DELETED ---
--- insert_image.html DELETED ---
--- insert_table.html DELETED ---
--- link.html DELETED ---
--- popup.js DELETED ---
--- select_color.html DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/help
about.inc, 1.1, NONE footer.inc, 1.1, NONE header.inc, 1.1,
NONE index.inc, 1.1, NONE menu.inc, 1.1, NONE
Message-ID: <20070802130456.BA93760AE59@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/help
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/help
Removed Files:
about.inc footer.inc header.inc index.inc menu.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- about.inc DELETED ---
--- footer.inc DELETED ---
--- header.inc DELETED ---
--- index.inc DELETED ---
--- menu.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/horde
menu.inc, 1.1, NONE
Message-ID: <20070802130456.C777260AE5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/horde
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/horde
Removed Files:
menu.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- menu.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:55 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/help
index.php, 1.1, NONE
Message-ID: <20070802130455.57F1F60AE51@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/help
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services/help
Removed Files:
index.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- index.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:53 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:53 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/download
index.php, 1.1, NONE
Message-ID: <20070802130453.21F6760AE4A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/services/download
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/services/download
Removed Files:
index.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- index.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/htmlarea
htmlarea.css, 1.1, NONE
Message-ID: <20070802130456.C850560AE5B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/htmlarea
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/htmlarea
Removed Files:
htmlarea.css
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- htmlarea.css DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/index
frames_index.inc, 1.1, NONE
Message-ID: <20070802130456.E4E9460AE5D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/index
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/index
Removed Files:
frames_index.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- frames_index.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/javascript
enter_key_trap.js, 1.1, NONE form_helpers.js, 1.1,
NONE form_sections.js, 1.1, NONE htmlarea.js, 1.1,
NONE htmlarea_lang.js, 1.1, NONE image.js, 1.1, NONE menu.js,
1.1, NONE open_calendar.js, 1.1, NONE open_colorpicker.js, 1.1,
NONE open_google_win.js, 1.1, NONE open_help_win.js, 1.1,
NONE open_html_helper.js, 1.1, NONE open_print_win.js, 1.1,
NONE open_share_edit_win.js, 1.1, NONE popup.js, 1.1,
NONE print.js, 1.1, NONE sorter.js, 1.1, NONE tooltip.js, 1.1,
NONE tree.js, 1.1, NONE
Message-ID: <20070802130456.E5F0360AE5E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/javascript
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/javascript
Removed Files:
enter_key_trap.js form_helpers.js form_sections.js htmlarea.js
htmlarea_lang.js image.js menu.js open_calendar.js
open_colorpicker.js open_google_win.js open_help_win.js
open_html_helper.js open_print_win.js open_share_edit_win.js
popup.js print.js sorter.js tooltip.js tree.js
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- enter_key_trap.js DELETED ---
--- form_helpers.js DELETED ---
--- form_sections.js DELETED ---
--- htmlarea.js DELETED ---
--- htmlarea_lang.js DELETED ---
--- image.js DELETED ---
--- menu.js DELETED ---
--- open_calendar.js DELETED ---
--- open_colorpicker.js DELETED ---
--- open_google_win.js DELETED ---
--- open_help_win.js DELETED ---
--- open_html_helper.js DELETED ---
--- open_print_win.js DELETED ---
--- open_share_edit_win.js DELETED ---
--- popup.js DELETED ---
--- print.js DELETED ---
--- sorter.js DELETED ---
--- tooltip.js DELETED ---
--- tree.js DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/contents
open_view_win.js, 1.1, NONE
Message-ID: <20070802130456.92A3C60AE56@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/contents
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/contents
Removed Files:
open_view_win.js
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- open_view_win.js DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/admin/user
add.inc, 1.1, NONE approve.inc, 1.1, NONE list.inc, 1.1,
NONE noadd.inc, 1.1, NONE nolist.inc, 1.1, NONE remove.inc, 1.1,
NONE removequeued.inc, 1.1, NONE update.inc, 1.1, NONE
Message-ID: <20070802130456.55A9160AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/admin/user
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/admin/user
Removed Files:
add.inc approve.inc list.inc noadd.inc nolist.inc remove.inc
removequeued.inc update.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- add.inc DELETED ---
--- approve.inc DELETED ---
--- list.inc DELETED ---
--- noadd.inc DELETED ---
--- nolist.inc DELETED ---
--- remove.inc DELETED ---
--- removequeued.inc DELETED ---
--- update.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:55 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/admin/groups
addchild.inc, 1.1, NONE delete.inc, 1.1, NONE edit.inc, 1.1, NONE
Message-ID: <20070802130455.EA76160AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/admin/groups
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/admin/groups
Removed Files:
addchild.inc delete.inc edit.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- addchild.inc DELETED ---
--- delete.inc DELETED ---
--- edit.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:55 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/admin
common-header.inc, 1.1, NONE
Message-ID: <20070802130455.A87BC60AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/admin
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/admin
Removed Files:
common-header.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- common-header.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/categorytree
rowend.inc, 1.1, NONE rowstart.inc, 1.1, NONE tablefoot.inc, 1.1,
NONE tablehead.inc, 1.1, NONE
Message-ID: <20070802130456.7CA4860AE55@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/categorytree
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/categorytree
Removed Files:
rowend.inc rowstart.inc tablefoot.inc tablehead.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- rowend.inc DELETED ---
--- rowstart.inc DELETED ---
--- tablefoot.inc DELETED ---
--- tablehead.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/links
links.inc, 1.1, NONE
Message-ID: <20070802130456.EA8C460AE60@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/links
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/links
Removed Files:
links.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- links.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/data
csvinfo.inc, 1.1, NONE csvmap.inc, 1.1, NONE date.inc, 1.1,
NONE datemap.inc, 1.1, NONE datetime.inc, 1.1, NONE time.inc,
1.1, NONE tsvinfo.inc, 1.1, NONE
Message-ID: <20070802130456.9381C60AE57@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/data
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/data
Removed Files:
csvinfo.inc csvmap.inc date.inc datemap.inc datetime.inc
time.inc tsvinfo.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- csvinfo.inc DELETED ---
--- csvmap.inc DELETED ---
--- date.inc DELETED ---
--- datemap.inc DELETED ---
--- datetime.inc DELETED ---
--- time.inc DELETED ---
--- tsvinfo.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/menu
menu.inc, 1.1, NONE
Message-ID: <20070802130457.053E260AE64@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/menu
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/menu
Removed Files:
menu.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- menu.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/maintenance
agreement_bottom.inc, 1.1, NONE agreement_middle.inc, 1.1,
NONE agreement_top.inc, 1.1, NONE confirm_bottom.inc, 1.1,
NONE confirm_middle.inc, 1.1, NONE confirm_top.inc, 1.1,
NONE javascript.inc, 1.1, NONE maintenance_bottom.inc, 1.1,
NONE maintenance_top.inc, 1.1, NONE notice_bottom.inc, 1.1,
NONE notice_middle.inc, 1.1, NONE notice_top.inc, 1.1, NONE
Message-ID: <20070802130457.038D360AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/maintenance
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/maintenance
Removed Files:
agreement_bottom.inc agreement_middle.inc agreement_top.inc
confirm_bottom.inc confirm_middle.inc confirm_top.inc
javascript.inc maintenance_bottom.inc maintenance_top.inc
notice_bottom.inc notice_middle.inc notice_top.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- agreement_bottom.inc DELETED ---
--- agreement_middle.inc DELETED ---
--- agreement_top.inc DELETED ---
--- confirm_bottom.inc DELETED ---
--- confirm_middle.inc DELETED ---
--- confirm_top.inc DELETED ---
--- javascript.inc DELETED ---
--- maintenance_bottom.inc DELETED ---
--- maintenance_top.inc DELETED ---
--- notice_bottom.inc DELETED ---
--- notice_middle.inc DELETED ---
--- notice_top.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/prefs
app.inc, 1.1, NONE begin.inc, 1.1, NONE categorymanagement.inc,
1.1, NONE checkbox.inc, 1.1, NONE deleteidentity.inc, 1.1,
NONE end.inc, 1.1, NONE enum.inc, 1.1, NONE identityselect.inc,
1.1, NONE link.inc, 1.1, NONE multienum.inc, 1.1,
NONE number.inc, 1.1, NONE overview.inc, 1.1, NONE password.inc,
1.1, NONE select.inc, 1.1, NONE text.inc, 1.1, NONE textarea.inc,
1.1, NONE
Message-ID: <20070802130457.1636160AE67@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/prefs
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/prefs
Removed Files:
app.inc begin.inc categorymanagement.inc checkbox.inc
deleteidentity.inc end.inc enum.inc identityselect.inc
link.inc multienum.inc number.inc overview.inc password.inc
select.inc text.inc textarea.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- app.inc DELETED ---
--- begin.inc DELETED ---
--- categorymanagement.inc DELETED ---
--- checkbox.inc DELETED ---
--- deleteidentity.inc DELETED ---
--- end.inc DELETED ---
--- enum.inc DELETED ---
--- identityselect.inc DELETED ---
--- link.inc DELETED ---
--- multienum.inc DELETED ---
--- number.inc DELETED ---
--- overview.inc DELETED ---
--- password.inc DELETED ---
--- select.inc DELETED ---
--- text.inc DELETED ---
--- textarea.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/portal
add.inc, 1.1, NONE block.inc, 1.1, NONE edit.inc, 1.1,
NONE empty.inc, 1.1, NONE footer.inc, 1.1, NONE header.inc, 1.1,
NONE layout.inc, 1.1, NONE menu.inc, 1.1, NONE
Message-ID: <20070802130457.0FCC160AE66@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/portal
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/portal
Removed Files:
add.inc block.inc edit.inc empty.inc footer.inc header.inc
layout.inc menu.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- add.inc DELETED ---
--- block.inc DELETED ---
--- edit.inc DELETED ---
--- empty.inc DELETED ---
--- footer.inc DELETED ---
--- header.inc DELETED ---
--- layout.inc DELETED ---
--- menu.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib/Block
minisearch.php, 1.1, NONE
Message-ID: <20070802130457.707BC60AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib/Block
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/lib/Block
Removed Files:
minisearch.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- minisearch.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/shares
edit.inc, 1.1, NONE
Message-ID: <20070802130457.20D3660AE6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/shares
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/shares
Removed Files:
edit.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- edit.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/test
extensions.inc, 1.1, NONE footer.inc, 1.1, NONE header.inc, 1.1,
NONE php_version.inc, 1.1, NONE version.inc, 1.1, NONE
Message-ID: <20070802130457.24C5560AE6B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/test
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/test
Removed Files:
extensions.inc footer.inc header.inc php_version.inc
version.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- extensions.inc DELETED ---
--- footer.inc DELETED ---
--- header.inc DELETED ---
--- php_version.inc DELETED ---
--- version.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/problem
problem.inc, 1.1, NONE
Message-ID: <20070802130457.1989960AE68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/problem
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/problem
Removed Files:
problem.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- problem.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/login
login.inc, 1.1, NONE mobile.inc, 1.1, NONE
Message-ID: <20070802130456.EDDF360AE63@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/login
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/login
Removed Files:
login.inc mobile.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- login.inc DELETED ---
--- mobile.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/bg_BG/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130457.9D52260AE77@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/bg_BG/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/bg_BG/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib/ObjectView
List.php, 1.1, NONE PhotoID.php, 1.1, NONE
Message-ID: <20070802130457.92ADA60AE75@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib/ObjectView
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/lib/ObjectView
Removed Files:
List.php PhotoID.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- List.php DELETED ---
--- PhotoID.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ar_SY/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130457.9A0C360AE76@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ar_SY/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/ar_SY/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ca_ES/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130457.A724B60AE78@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ca_ES/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/ca_ES/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/rpcsum
javascript.inc, 1.1, NONE manage.inc, 1.1, NONE
Message-ID: <20070802130457.1D7C460AE69@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/rpcsum
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/rpcsum
Removed Files:
javascript.inc manage.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- javascript.inc DELETED ---
--- manage.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib
.htaccess, 1.1, NONE AbstractObject.php, 1.1, NONE Driver.php,
1.1, NONE Group.php, 1.1, NONE List.php, 1.1, NONE ListView.php,
1.1, NONE Object.php, 1.1, NONE ObjectView.php, 1.1,
NONE Renderer.php, 1.1, NONE Source.php, 1.1, NONE Turba.php,
1.1, NONE api.php, 1.1, NONE base.php, 1.1, NONE prefs.php, 1.1,
NONE version.php, 1.1, NONE
Message-ID: <20070802130457.5690F60AE71@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/lib
Removed Files:
.htaccess AbstractObject.php Driver.php Group.php List.php
ListView.php Object.php ObjectView.php Renderer.php Source.php
Turba.php api.php base.php prefs.php version.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .htaccess DELETED ---
--- AbstractObject.php DELETED ---
--- Driver.php DELETED ---
--- Group.php DELETED ---
--- List.php DELETED ---
--- ListView.php DELETED ---
--- Object.php DELETED ---
--- ObjectView.php DELETED ---
--- Renderer.php DELETED ---
--- Source.php DELETED ---
--- Turba.php DELETED ---
--- api.php DELETED ---
--- base.php DELETED ---
--- prefs.php DELETED ---
--- version.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib/Driver
imsp.php, 1.1, NONE kolab.php, 1.1, NONE ldap.php, 1.1,
NONE prefs.php, 1.1, NONE sql.php, 1.1, NONE
Message-ID: <20070802130457.77DE560AE72@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib/Driver
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/lib/Driver
Removed Files:
imsp.php kolab.php ldap.php prefs.php sql.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- imsp.php DELETED ---
--- kolab.php DELETED ---
--- ldap.php DELETED ---
--- prefs.php DELETED ---
--- sql.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale
.htaccess, 1.1, NONE
Message-ID: <20070802130457.9530260AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale
Removed Files:
.htaccess
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .htaccess DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/config/themes
html-orange.php, 1.1, NONE
Message-ID: <20070802130457.3ACC660AE6D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/config/themes
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/config/themes
Removed Files:
html-orange.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- html-orange.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba
COPYING, 1.1, NONE README, 1.1, NONE addlink.php, 1.1,
NONE browse.php, 1.1, NONE display.php, 1.1, NONE index.php, 1.1,
NONE minisearch.php, 1.1, NONE miniwindow.php, 1.1,
NONE search.php, 1.1, NONE vcard.php, 1.1, NONE
Message-ID: <20070802130457.2F87960AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba
Removed Files:
COPYING README addlink.php browse.php display.php index.php
minisearch.php miniwindow.php search.php vcard.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- COPYING DELETED ---
--- README DELETED ---
--- addlink.php DELETED ---
--- browse.php DELETED ---
--- display.php DELETED ---
--- index.php DELETED ---
--- minisearch.php DELETED ---
--- miniwindow.php DELETED ---
--- search.php DELETED ---
--- vcard.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/docs
CHANGES, 1.1, NONE CREDITS, 1.1, NONE INSTALL, 1.1, NONE LDAP,
1.1, NONE RELEASE_NOTES, 1.1, NONE TODO, 1.1, NONE
Message-ID: <20070802130457.3FB3460AE6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/docs
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/docs
Removed Files:
CHANGES CREDITS INSTALL LDAP RELEASE_NOTES TODO
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- CHANGES DELETED ---
--- CREDITS DELETED ---
--- INSTALL DELETED ---
--- LDAP DELETED ---
--- RELEASE_NOTES DELETED ---
--- TODO DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib/List
Plain.php, 1.1, NONE Tree.php, 1.1, NONE
Message-ID: <20070802130457.867ED60AE73@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib/List
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/lib/List
Removed Files:
Plain.php Tree.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- Plain.php DELETED ---
--- Tree.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib/ListView
Rolodex.php, 1.1, NONE Tree.php, 1.1, NONE
Message-ID: <20070802130457.8DBFC60AE74@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/lib/ListView
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/lib/ListView
Removed Files:
Rolodex.php Tree.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- Rolodex.php DELETED ---
--- Tree.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/cs_CZ/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130457.AD9A160AE79@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/cs_CZ/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/cs_CZ/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/config
.cvsignore, 1.1, NONE .htaccess, 1.1, NONE attributes.php.dist,
1.1, NONE conf.xml, 1.1, NONE html.php.dist, 1.1,
NONE menu.php.dist, 1.1, NONE prefs.php.dist, 1.1,
NONE sources.php.dist, 1.1, NONE
Message-ID: <20070802130457.3940D60AE6C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/config
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/config
Removed Files:
.cvsignore .htaccess attributes.php.dist conf.xml
html.php.dist menu.php.dist prefs.php.dist sources.php.dist
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .cvsignore DELETED ---
--- .htaccess DELETED ---
--- attributes.php.dist DELETED ---
--- conf.xml DELETED ---
--- html.php.dist DELETED ---
--- menu.php.dist DELETED ---
--- prefs.php.dist DELETED ---
--- sources.php.dist DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/da_DK/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130457.B4E9060AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/da_DK/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/da_DK/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/graphics
add.gif, 1.1, NONE edit.gif, 1.1, NONE group.gif, 1.1,
NONE search.gif, 1.1, NONE turba.gif, 1.1, NONE user.gif, 1.1, NONE
Message-ID: <20070802130457.4BEC660AE70@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/graphics
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/graphics
Removed Files:
add.gif edit.gif group.gif search.gif turba.gif user.gif
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- add.gif DELETED ---
--- edit.gif DELETED ---
--- group.gif DELETED ---
--- search.gif DELETED ---
--- turba.gif DELETED ---
--- user.gif DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/en_US
help.xml, 1.1, NONE
Message-ID: <20070802130457.C862960AE7C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/en_US
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/en_US
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/docs/vcf
README, 1.1, NONE brad.vcf, 1.1, NONE dimitris.vcf, 1.1,
NONE dwalt.vcf, 1.1, NONE foo.vcf, 1.1, NONE larry.vcf, 1.1,
NONE multiple.vcf, 1.1, NONE palm.vcf, 1.1, NONE sfg.vcf, 1.1,
NONE test.vcf, 1.1, NONE
Message-ID: <20070802130457.4708C60AE6F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/docs/vcf
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/docs/vcf
Removed Files:
README brad.vcf dimitris.vcf dwalt.vcf foo.vcf larry.vcf
multiple.vcf palm.vcf sfg.vcf test.vcf
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- README DELETED ---
--- brad.vcf DELETED ---
--- dimitris.vcf DELETED ---
--- dwalt.vcf DELETED ---
--- foo.vcf DELETED ---
--- larry.vcf DELETED ---
--- multiple.vcf DELETED ---
--- palm.vcf DELETED ---
--- sfg.vcf DELETED ---
--- test.vcf DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/admin/setup
config.html, 1.1, NONE index.html, 1.1, NONE
Message-ID: <20070802130456.3FD2E60AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/admin/setup
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/admin/setup
Removed Files:
config.html index.html
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- config.html DELETED ---
--- index.html DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:51 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:51 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/scripts/db
README, 1.1, NONE README.ORACLE, 1.1, NONE auth.sql, 1.1,
NONE auth_initial_user.sql, 1.1, NONE datatree.sql, 1.1,
NONE datatree_mysql.sql, 1.1, NONE log.sql, 1.1, NONE muvfs.sql,
1.1, NONE mysql_create.sql, 1.1, NONE mysql_drop.sql, 1.1,
NONE oracle_create.sql, 1.1, NONE oracle_create_alternate.sql,
1.1, NONE pgsql_create.sql, 1.1, NONE pgsql_drop.sql, 1.1,
NONE prefs.sql, 1.1, NONE sessionhandler.sql, 1.1,
NONE sessionhandler_pgsql.sql, 1.1,
NONE sessionhandler_sapdb.sql, 1.1, NONE sybase_create.sql, 1.1,
NONE token.sql, 1.1, NONE vfs.sql, 1.1, NONE vfs_oracle.sql, 1.1,
NONE vfs_pgsql.sql, 1.1, NONE
Message-ID: <20070802130451.379F060AE86@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/scripts/db
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/scripts/db
Removed Files:
README README.ORACLE auth.sql auth_initial_user.sql
datatree.sql datatree_mysql.sql log.sql muvfs.sql
mysql_create.sql mysql_drop.sql oracle_create.sql
oracle_create_alternate.sql pgsql_create.sql pgsql_drop.sql
prefs.sql sessionhandler.sql sessionhandler_pgsql.sql
sessionhandler_sapdb.sql sybase_create.sql token.sql vfs.sql
vfs_oracle.sql vfs_pgsql.sql
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- README DELETED ---
--- README.ORACLE DELETED ---
--- auth.sql DELETED ---
--- auth_initial_user.sql DELETED ---
--- datatree.sql DELETED ---
--- datatree_mysql.sql DELETED ---
--- log.sql DELETED ---
--- muvfs.sql DELETED ---
--- mysql_create.sql DELETED ---
--- mysql_drop.sql DELETED ---
--- oracle_create.sql DELETED ---
--- oracle_create_alternate.sql DELETED ---
--- pgsql_create.sql DELETED ---
--- pgsql_drop.sql DELETED ---
--- prefs.sql DELETED ---
--- sessionhandler.sql DELETED ---
--- sessionhandler_pgsql.sql DELETED ---
--- sessionhandler_sapdb.sql DELETED ---
--- sybase_create.sql DELETED ---
--- token.sql DELETED ---
--- vfs.sql DELETED ---
--- vfs_oracle.sql DELETED ---
--- vfs_pgsql.sql DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/guest
guest.inc, 1.1, NONE
Message-ID: <20070802130456.B9BF560AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/guest
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/guest
Removed Files:
guest.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- guest.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:56 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/htmlarea/popups
about.html, 1.1, NONE blank.html, 1.1, NONE custom2.html, 1.1,
NONE editor_help.html, 1.1, NONE fullscreen.html, 1.1,
NONE insert_image.html, 1.1, NONE insert_table.html, 1.1,
NONE old-fullscreen.html, 1.1, NONE old_insert_image.html, 1.1,
NONE popup.js, 1.1, NONE select_color.html, 1.1, NONE
Message-ID: <20070802130456.E40FA60AE5C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/templates/htmlarea/popups
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/templates/htmlarea/popups
Removed Files:
about.html blank.html custom2.html editor_help.html
fullscreen.html insert_image.html insert_table.html
old-fullscreen.html old_insert_image.html popup.js
select_color.html
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- about.html DELETED ---
--- blank.html DELETED ---
--- custom2.html DELETED ---
--- editor_help.html DELETED ---
--- fullscreen.html DELETED ---
--- insert_image.html DELETED ---
--- insert_table.html DELETED ---
--- old-fullscreen.html DELETED ---
--- old_insert_image.html DELETED ---
--- popup.js DELETED ---
--- select_color.html DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:59 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/et_EE/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130459.2C31A60AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/et_EE/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/et_EE/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/de_DE
help.xml, 1.1, NONE
Message-ID: <20070802130457.B83DA60AE55@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/de_DE
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/de_DE
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/el_GR/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130457.C379B60AE7B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/el_GR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/el_GR/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/de_DE/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130457.BC3BF60AE7A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/de_DE/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/de_DE/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:00 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/gl_ES/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130500.86C8660AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/gl_ES/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/gl_ES/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:00 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/hu_HU/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130500.9941A60AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/hu_HU/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/hu_HU/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:00 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/it_IT/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130500.D8C5760AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/it_IT/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/it_IT/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:01 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/lv_LV/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130501.F153460AE4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/lv_LV/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/lv_LV/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:01 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/nl_NL/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130501.F39F560AE52@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/nl_NL/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/nl_NL/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/nb_NO/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.1614F60AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/nb_NO/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/nb_NO/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:01 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ja_JP/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130501.B4A9860AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ja_JP/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/ja_JP/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:59 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/fi_FI
help.xml, 1.1, NONE
Message-ID: <20070802130459.5346960AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/fi_FI
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/fi_FI
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:57 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/es_ES/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130457.DBE7760AE7D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/es_ES/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/es_ES/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/pt_PT/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.1864560AE55@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/pt_PT/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/pt_PT/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:01 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ko_KR/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130501.DDC1560AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ko_KR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/ko_KR/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/pl_PL/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.158BD60AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/pl_PL/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/pl_PL/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/pt_PT
help.xml, 1.1, NONE
Message-ID: <20070802130502.17A1160AE54@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/pt_PT
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/pt_PT
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/nn_NO/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.004AC60AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/nn_NO/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/nn_NO/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:01 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/lt_LT/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130501.DE84760AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/lt_LT/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/lt_LT/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/pt_BR/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.16DC460AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/pt_BR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/pt_BR/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:04:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:04:59 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/fi_FI/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130459.B98E060AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/fi_FI/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/fi_FI/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/sl_SI/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.3060660AE4D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/sl_SI/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/sl_SI/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:00 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/fr_FR/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130500.444BA60AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/fr_FR/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/fr_FR/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ro_RO/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.1922B60AE56@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ro_RO/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/ro_RO/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:01 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/mk_MK/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130501.F286360AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/mk_MK/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/mk_MK/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ru_RU/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.19F6E60AE57@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/ru_RU/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/ru_RU/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/sk_SK
help.xml, 1.1, NONE
Message-ID: <20070802130502.1ABA860AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/sk_SK
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/sk_SK
Removed Files:
help.xml
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- help.xml DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/sv_SE/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.313EF60AE4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/sv_SE/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/sv_SE/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/sk_SK/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.1B78860AE59@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/sk_SK/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/sk_SK/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/uk_UA/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.321D160AE4F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/uk_UA/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/uk_UA/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates
.htaccess, 1.1, NONE common-header.inc, 1.1, NONE
Message-ID: <20070802130502.8634C60AE6C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/templates
Removed Files:
.htaccess common-header.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .htaccess DELETED ---
--- common-header.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/data
export.inc, 1.1, NONE import.inc, 1.1, NONE
Message-ID: <20070802130502.9F34260AE70@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/data
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/templates/data
Removed Files:
export.inc import.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- export.inc DELETED ---
--- import.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/addlink
contacts.inc, 1.1, NONE menu.inc, 1.1, NONE
Message-ID: <20070802130502.8701F60AE6D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/addlink
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/templates/addlink
Removed Files:
contacts.inc menu.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- contacts.inc DELETED ---
--- menu.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/miniwindow
frames.inc, 1.1, NONE menu.inc, 1.1, NONE
Message-ID: <20070802130502.A0E0360AE5E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/miniwindow
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/templates/miniwindow
Removed Files:
frames.inc menu.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- frames.inc DELETED ---
--- menu.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/util
barcode.php, 1.1, NONE css2horde.php, 1.1,
NONE google_example.php, 1.1, NONE po_stats.php, 1.1, NONE
Message-ID: <20070802130502.A275160AE73@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/util
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/util
Removed Files:
barcode.php css2horde.php google_example.php po_stats.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- barcode.php DELETED ---
--- css2horde.php DELETED ---
--- google_example.php DELETED ---
--- po_stats.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/scripts/ldap
addou, 1.1, NONE addou.pl, 1.1, NONE core.schema.patch, 1.1,
NONE rfc2739.schema, 1.1, NONE
Message-ID: <20070802130502.8536C60AE6B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/scripts/ldap
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/scripts/ldap
Removed Files:
addou addou.pl core.schema.patch rfc2739.schema
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- addou DELETED ---
--- addou.pl DELETED ---
--- core.schema.patch DELETED ---
--- rfc2739.schema DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/prefs
columnselect.inc, 1.1, NONE
Message-ID: <20070802130502.A1AF760AE72@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/prefs
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/templates/prefs
Removed Files:
columnselect.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- columnselect.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/block
minisearch.inc, 1.1, NONE
Message-ID: <20070802130502.87E2A60AE6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/block
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/templates/block
Removed Files:
minisearch.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- minisearch.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/scripts/drivers
mysql_create.sql, 1.1, NONE oci8_create.sql, 1.1,
NONE pgsql_create.sql, 1.1, NONE turba.sql, 1.1,
NONE wedding.sql, 1.1, NONE
Message-ID: <20070802130502.843AE60AE6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/scripts/drivers
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/scripts/drivers
Removed Files:
mysql_create.sql oci8_create.sql pgsql_create.sql turba.sql
wedding.sql
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- mysql_create.sql DELETED ---
--- oci8_create.sql DELETED ---
--- pgsql_create.sql DELETED ---
--- turba.sql DELETED ---
--- wedding.sql DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/browse
actions.inc, 1.1, NONE column_footers.inc, 1.1,
NONE column_headers.inc, 1.1, NONE contactrow.inc, 1.1,
NONE footer.inc, 1.1, NONE footerAlpha.inc, 1.1, NONE header.inc,
1.1, NONE javascript.inc, 1.1, NONE search.inc, 1.1,
NONE search_criteria.inc, 1.1, NONE select.inc, 1.1, NONE
Message-ID: <20070802130502.9E60D60AE6F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/browse
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/templates/browse
Removed Files:
actions.inc column_footers.inc column_headers.inc
contactrow.inc footer.inc footerAlpha.inc header.inc
javascript.inc search.inc search_criteria.inc select.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- actions.inc DELETED ---
--- column_footers.inc DELETED ---
--- column_headers.inc DELETED ---
--- contactrow.inc DELETED ---
--- footer.inc DELETED ---
--- footerAlpha.inc DELETED ---
--- header.inc DELETED ---
--- javascript.inc DELETED ---
--- search.inc DELETED ---
--- search_criteria.inc DELETED ---
--- select.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/po
.cvsignore, 1.1, NONE .htaccess, 1.1, NONE README, 1.1,
NONE ar_SY.po, 1.1, NONE bg_BG.po, 1.1, NONE ca_ES.po, 1.1,
NONE cs_CZ.po, 1.1, NONE da_DK.po, 1.1, NONE de_DE.po, 1.1,
NONE el_GR.po, 1.1, NONE es_ES.po, 1.1, NONE et_EE.po, 1.1,
NONE fi_FI.po, 1.1, NONE fr_FR.po, 1.1, NONE gl_ES.po, 1.1,
NONE hu_HU.po, 1.1, NONE it_IT.po, 1.1, NONE ja_JP.po, 1.1,
NONE ko_KR.po, 1.1, NONE lt_LT.po, 1.1, NONE lv_LV.po, 1.1,
NONE mk_MK.po, 1.1, NONE nb_NO.po, 1.1, NONE nl_NL.po, 1.1,
NONE nn_NO.po, 1.1, NONE pl_PL.po, 1.1, NONE pt_BR.po, 1.1,
NONE pt_PT.po, 1.1, NONE ro_RO.po, 1.1, NONE ru_RU.po, 1.1,
NONE sk_SK.po, 1.1, NONE sl_SI.po, 1.1, NONE sv_SE.po, 1.1,
NONE turba.pot, 1.1, NONE uk_UA.po, 1.1, NONE zh_CN.po, 1.1,
NONE zh_TW.po, 1.1, NONE
Message-ID: <20070802130502.8277060AE68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/po
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/po
Removed Files:
.cvsignore .htaccess README ar_SY.po bg_BG.po ca_ES.po
cs_CZ.po da_DK.po de_DE.po el_GR.po es_ES.po et_EE.po fi_FI.po
fr_FR.po gl_ES.po hu_HU.po it_IT.po ja_JP.po ko_KR.po lt_LT.po
lv_LV.po mk_MK.po nb_NO.po nl_NL.po nn_NO.po pl_PL.po pt_BR.po
pt_PT.po ro_RO.po ru_RU.po sk_SK.po sl_SI.po sv_SE.po
turba.pot uk_UA.po zh_CN.po zh_TW.po
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .cvsignore DELETED ---
--- .htaccess DELETED ---
--- README DELETED ---
--- ar_SY.po DELETED ---
--- bg_BG.po DELETED ---
--- ca_ES.po DELETED ---
--- cs_CZ.po DELETED ---
--- da_DK.po DELETED ---
--- de_DE.po DELETED ---
--- el_GR.po DELETED ---
--- es_ES.po DELETED ---
--- et_EE.po DELETED ---
--- fi_FI.po DELETED ---
--- fr_FR.po DELETED ---
--- gl_ES.po DELETED ---
--- hu_HU.po DELETED ---
--- it_IT.po DELETED ---
--- ja_JP.po DELETED ---
--- ko_KR.po DELETED ---
--- lt_LT.po DELETED ---
--- lv_LV.po DELETED ---
--- mk_MK.po DELETED ---
--- nb_NO.po DELETED ---
--- nl_NL.po DELETED ---
--- nn_NO.po DELETED ---
--- pl_PL.po DELETED ---
--- pt_BR.po DELETED ---
--- pt_PT.po DELETED ---
--- ro_RO.po DELETED ---
--- ru_RU.po DELETED ---
--- sk_SK.po DELETED ---
--- sl_SI.po DELETED ---
--- sv_SE.po DELETED ---
--- turba.pot DELETED ---
--- uk_UA.po DELETED ---
--- zh_CN.po DELETED ---
--- zh_TW.po DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/packaging/redhat
rh9-turba.spec, 1.1, NONE turba.README, 1.1, NONE turba.conf,
1.1, NONE turba.spec, 1.1, NONE
Message-ID: <20070802130502.4984C60AE5B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/packaging/redhat
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/packaging/redhat
Removed Files:
rh9-turba.spec turba.README turba.conf turba.spec
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- rh9-turba.spec DELETED ---
--- turba.README DELETED ---
--- turba.conf DELETED ---
--- turba.spec DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/zh_CN/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.3311E60AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/zh_CN/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/zh_CN/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/scripts
.htaccess, 1.1, NONE Turba.reg, 1.1,
NONE create_default_history.php, 1.1, NONE
Message-ID: <20070802130502.836AF60AE69@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/scripts
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/scripts
Removed Files:
.htaccess Turba.reg create_default_history.php
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- .htaccess DELETED ---
--- Turba.reg DELETED ---
--- create_default_history.php DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/menu
menu.inc, 1.1, NONE
Message-ID: <20070802130502.9FF7060AE71@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/templates/menu
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/templates/menu
Removed Files:
menu.inc
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- menu.inc DELETED ---
From cvs at kolab.org Thu Aug 2 15:05:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:05:02 +0200 (CEST)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/zh_TW/LC_MESSAGES
turba.mo, 1.1, NONE
Message-ID: <20070802130502.33DA760AE5A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba/locale/zh_TW/LC_MESSAGES
In directory doto:/tmp/cvs-serv5048/kolab-horde-fbview/fbview/turba/locale/zh_TW/LC_MESSAGES
Removed Files:
turba.mo
Log Message:
Removed kolab-horde-fbview from CVS. The new packages are horde/fbview-horde and horde/fbview-kronolith.
--- turba.mo DELETED ---
From cvs at kolab.org Thu Aug 2 15:55:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:55:57 +0200 (CEST)
Subject: gunnar: server/horde/fbview-kronolith fbview-kronolith.spec,1.4,1.5
Message-ID: <20070802135557.3D33360AE52@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv7357/horde/fbview-kronolith
Modified Files:
fbview-kronolith.spec
Log Message:
Kronolith requires PEAR-Date.
Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fbview-kronolith.spec 2 Aug 2007 12:27:34 -0000 1.4
+++ fbview-kronolith.spec 2 Aug 2007 13:55:55 -0000 1.5
@@ -48,6 +48,7 @@
PreReq: php, php::with_pear = yes
PreReq: fbview-horde >= %{V_version}
PreReq: horde-framework-kolab >= %{V_version}
+PreReq: PEAR-Date >= 1.4.7
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Thu Aug 2 15:55:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:55:57 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith horde-kronolith-kolab.spec, 1.5,
1.6
Message-ID: <20070802135557.41B1A60AE53@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv7357/horde/horde-kronolith
Modified Files:
horde-kronolith-kolab.spec
Log Message:
Kronolith requires PEAR-Date.
Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-kronolith-kolab.spec 23 Jul 2007 16:06:42 -0000 1.5
+++ horde-kronolith-kolab.spec 2 Aug 2007 13:55:55 -0000 1.6
@@ -34,6 +34,7 @@
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
PreReq: horde-framework-kolab >= %{V_version}
+PreReq: PEAR-Date >= 1.4.7
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Thu Aug 2 15:55:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 2 Aug 2007 15:55:57 +0200 (CEST)
Subject: gunnar: server/horde/fbview-horde conf.php,1.3,1.4
Message-ID: <20070802135557.38DD860AE50@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv7357/horde/fbview-horde
Modified Files:
conf.php
Log Message:
Kronolith requires PEAR-Date.
Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/conf.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- conf.php 2 Aug 2007 12:28:28 -0000 1.3
+++ conf.php 2 Aug 2007 13:55:55 -0000 1.4
@@ -29,7 +29,7 @@
$conf['log']['priority'] = PEAR_LOG_NOTICE;
$conf['log']['ident'] = 'HORDE';
$conf['log']['params'] = array();
-$conf['log']['name'] = '/kolab/var/apache2/fbview/fbview.log';
+$conf['log']['name'] = '/kolab/var/apache2/log/fbview/fbview.log';
$conf['log']['params']['append'] = true;
$conf['log']['type'] = 'file';
$conf['log']['enabled'] = true;
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/fbview-horde fbview-horde.spec,1.4,1.5
Message-ID: <20070803073810.05C5060AE40@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv5965/horde/fbview-horde
Modified Files:
fbview-horde.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: fbview-horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fbview-horde.spec 2 Aug 2007 12:28:28 -0000 1.4
+++ fbview-horde.spec 3 Aug 2007 07:38:07 -0000 1.5
@@ -38,7 +38,7 @@
PreReq: php, php::with_pear = yes
PreReq: PEAR-Mail_Mime >= 1.3.1
PreReq: PEAR-Mail >= 1.1.14
-PreReq: horde-framework-kolab >= %{V_version}
+PreReq: horde-framework-kolab >= 3.1.4.99
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework Makefile, 1.6,
1.7 horde-framework-kolab.spec, 1.9, 1.10
Message-ID: <20070803073810.1B0EF60AE40@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv5965/horde/horde-framework
Modified Files:
Makefile horde-framework-kolab.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 2 Aug 2007 07:57:13 -0000 1.6
+++ Makefile 3 Aug 2007 07:38:08 -0000 1.7
@@ -19,8 +19,8 @@
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/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- horde-framework-kolab.spec 2 Aug 2007 12:28:28 -0000 1.9
+++ horde-framework-kolab.spec 3 Aug 2007 07:38:08 -0000 1.10
@@ -4,9 +4,9 @@
%define V_year 2007
%define V_month 08
%define V_day 03
-%define V_version %{V_year}%{V_month}%{V_day}
+%define V_version 3.1.4.99
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release 1
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/fbview-kronolith fbview-kronolith.spec, 1.5,
1.6 prefs.php, 1.1, 1.2
Message-ID: <20070803073810.0E74160AE44@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv5965/horde/fbview-kronolith
Modified Files:
fbview-kronolith.spec prefs.php
Log Message:
Prepared the horde packages for a first test installation.
Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fbview-kronolith.spec 2 Aug 2007 13:55:55 -0000 1.5
+++ fbview-kronolith.spec 3 Aug 2007 07:38:08 -0000 1.6
@@ -46,8 +46,8 @@
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
-PreReq: fbview-horde >= %{V_version}
-PreReq: horde-framework-kolab >= %{V_version}
+PreReq: fbview-horde >= 3.1.4.99
+PreReq: horde-framework-kolab >= 3.1.4.99
PreReq: PEAR-Date >= 1.4.7
AutoReq: no
@@ -73,7 +73,15 @@
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
+ # Copy the dist configs into the real configuration files
cd %{V_horde_name}/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
+
+ # Remove some stuff not necessary for fbview
+ cd %{V_horde_name} && rm add.php calendars.php day.php perms.php view.php \
+ delete.php ics.php search.php week.php contacts.php \
+ imple.php month.php pref_api.php workweek.php \
+ edit.php new.php test.php year.php attend.php \
+ data.php event.php
cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/
Index: prefs.php
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/prefs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prefs.php 2 Aug 2007 10:35:19 -0000 1.1
+++ prefs.php 3 Aug 2007 07:38:08 -0000 1.2
@@ -459,3 +459,11 @@
'shared' => false,
'type' => 'implicit'
);
+
+$_prefs['saved_attendee_list'] = array(
+ 'value' => 'a:0:{}',
+ 'locked' => false,
+ 'shared' => false,
+ 'type' => 'implicit',
+ 'desc' => _("A saved list of attendees")
+);
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo Makefile, 1.4,
1.5 horde-mnemo-kolab.spec, 1.5, 1.6
Message-ID: <20070803073810.37DDF60AE44@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv5965/horde/horde-mnemo
Modified Files:
Makefile horde-mnemo-kolab.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 2 Aug 2007 07:57:13 -0000 1.4
+++ Makefile 3 Aug 2007 07:38:08 -0000 1.5
@@ -19,8 +19,8 @@
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/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: horde-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-mnemo-kolab.spec 23 Jul 2007 16:06:43 -0000 1.5
+++ horde-mnemo-kolab.spec 3 Aug 2007 07:38:08 -0000 1.6
@@ -2,11 +2,11 @@
%define V_horde_name mnemo
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 07
-%define V_day 23
-%define V_version %{V_year}%{V_month}%{V_day}
+%define V_month 08
+%define V_day 03
+%define V_version 2.1.1.99
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release 1
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
@@ -32,8 +32,7 @@
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
-PreReq: PEAR-Net_Sieve >= 1.1.5
-PreReq: horde-framework-kolab >= %{V_version}
+PreReq: horde-kolab >= 3.1.4.99
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/horde Makefile, 1.12, 1.13 conf.php, 1.2,
1.3 horde-kolab-conf.template, 1.1, 1.2 horde-kolab.spec, 1.5, 1.6
Message-ID: <20070803073810.16C1560AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv5965/horde/horde
Modified Files:
Makefile conf.php horde-kolab-conf.template horde-kolab.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile 2 Aug 2007 07:57:13 -0000 1.12
+++ Makefile 3 Aug 2007 07:38:08 -0000 1.13
@@ -19,8 +19,8 @@
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = $(HORDE_NAME)-kolab
-VERSION = ${YEAR}${MONTH}${DAY}
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/horde/conf.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- conf.php 25 May 2007 10:52:24 -0000 1.2
+++ conf.php 3 Aug 2007 07:38:08 -0000 1.3
@@ -29,7 +29,7 @@
$conf['log']['priority'] = PEAR_LOG_NOTICE;
$conf['log']['ident'] = 'HORDE';
$conf['log']['params'] = array();
-$conf['log']['name'] = '/tmp/horde.log';
+$conf['log']['name'] = '/kolab/var/apache2/log/fbview/fbview.log';
$conf['log']['params']['append'] = true;
$conf['log']['type'] = 'file';
$conf['log']['enabled'] = true;
Index: horde-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab-conf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-kolab-conf.template 25 May 2007 10:21:44 -0000 1.1
+++ horde-kolab-conf.template 3 Aug 2007 07:38:08 -0000 1.2
@@ -4,12 +4,10 @@
OWNERSHIP=kolab-n:kolab-n
KOLAB_META_END
= 1.3.1
PreReq: PEAR-Mail >= 1.1.14
-PreReq: horde-framework-kolab >= %{V_version}
+PreReq: PEAR-Log >= 1.9.9
+PreReq: horde-framework-kolab >= 3.1.4.99
AutoReq: no
AutoReqProv: no
@@ -71,6 +72,7 @@
$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/config/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache2/log/horde \
'%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' \
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag Makefile, 1.4, 1.5 horde-nag-kolab.spec,
1.5, 1.6
Message-ID: <20070803073810.3DCFA60AE46@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv5965/horde/horde-nag
Modified Files:
Makefile horde-nag-kolab.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 2 Aug 2007 07:57:13 -0000 1.4
+++ Makefile 3 Aug 2007 07:38:08 -0000 1.5
@@ -19,8 +19,8 @@
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/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: horde-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-nag-kolab.spec 23 Jul 2007 16:06:43 -0000 1.5
+++ horde-nag-kolab.spec 3 Aug 2007 07:38:08 -0000 1.6
@@ -2,11 +2,11 @@
%define V_horde_name nag
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 07
-%define V_day 23
-%define V_version %{V_year}%{V_month}%{V_day}
+%define V_month 08
+%define V_day 03
+%define V_version 2.1.3.99
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release 1
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
@@ -32,7 +32,7 @@
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
-PreReq: horde-framework-kolab >= %{V_version}
+PreReq: horde-kolab >= 3.1.4.99
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba Makefile, 1.4,
1.5 horde-turba-kolab.spec, 1.6, 1.7
Message-ID: <20070803073810.4B24360AE47@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv5965/horde/horde-turba
Modified Files:
Makefile horde-turba-kolab.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 2 Aug 2007 07:57:13 -0000 1.4
+++ Makefile 3 Aug 2007 07:38:08 -0000 1.5
@@ -19,8 +19,8 @@
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/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- horde-turba-kolab.spec 23 Jul 2007 16:06:43 -0000 1.6
+++ horde-turba-kolab.spec 3 Aug 2007 07:38:08 -0000 1.7
@@ -2,11 +2,11 @@
%define V_horde_name turba
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 07
-%define V_day 23
-%define V_version %{V_year}%{V_month}%{V_day}
+%define V_month 08
+%define V_day 03
+%define V_version 2.1.4.99
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release 1
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
@@ -52,7 +52,7 @@
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
-PreReq: horde-framework-kolab >= %{V_version}
+PreReq: horde-kolab >= 3.1.4.99
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith Makefile, 1.4,
1.5 horde-kronolith-kolab.spec, 1.6, 1.7
Message-ID: <20070803073810.334B760AE40@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv5965/horde/horde-kronolith
Modified Files:
Makefile horde-kronolith-kolab.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 2 Aug 2007 07:57:13 -0000 1.4
+++ Makefile 3 Aug 2007 07:38:08 -0000 1.5
@@ -19,8 +19,8 @@
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/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- horde-kronolith-kolab.spec 2 Aug 2007 13:55:55 -0000 1.6
+++ horde-kronolith-kolab.spec 3 Aug 2007 07:38:08 -0000 1.7
@@ -2,11 +2,11 @@
%define V_horde_name kronolith
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 07
-%define V_day 23
-%define V_version %{V_year}%{V_month}%{V_day}
+%define V_month 08
+%define V_day 03
+%define V_version 2.1.5.99
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release 1
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
@@ -33,7 +33,7 @@
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
-PreReq: horde-framework-kolab >= %{V_version}
+PreReq: horde-kolab >= 3.1.4.99
PreReq: PEAR-Date >= 1.4.7
AutoReq: no
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd Makefile, 1.4,
1.5 horde-passwd-kolab.spec, 1.5, 1.6
Message-ID: <20070803073810.473F460AE45@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv5965/horde/horde-passwd
Modified Files:
Makefile horde-passwd-kolab.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 2 Aug 2007 07:57:13 -0000 1.4
+++ Makefile 3 Aug 2007 07:38:08 -0000 1.5
@@ -19,8 +19,8 @@
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/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-passwd-kolab.spec 23 Jul 2007 16:06:43 -0000 1.5
+++ horde-passwd-kolab.spec 3 Aug 2007 07:38:08 -0000 1.6
@@ -2,11 +2,11 @@
%define V_horde_name passwd
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 07
-%define V_day 23
-%define V_version %{V_year}%{V_month}%{V_day}
+%define V_month 08
+%define V_day 03
+%define V_version 3.0.1.99
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release 1
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
@@ -32,7 +32,7 @@
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
-PreReq: horde-framework-kolab >= %{V_version}
+PreReq: horde-kolab >= 3.1.4.99
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp Makefile, 1.4, 1.5 horde-imp-kolab.spec,
1.6, 1.7
Message-ID: <20070803073810.206E560AE46@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv5965/horde/horde-imp
Modified Files:
Makefile horde-imp-kolab.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 2 Aug 2007 07:57:13 -0000 1.4
+++ Makefile 3 Aug 2007 07:38:08 -0000 1.5
@@ -19,8 +19,8 @@
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/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- horde-imp-kolab.spec 23 Jul 2007 16:06:42 -0000 1.6
+++ horde-imp-kolab.spec 3 Aug 2007 07:38:08 -0000 1.7
@@ -2,11 +2,11 @@
%define V_horde_name imp
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 07
-%define V_day 23
-%define V_version %{V_year}%{V_month}%{V_day}
+%define V_month 08
+%define V_day 03
+%define V_version 4.1.4.99
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release 1
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
@@ -34,7 +34,7 @@
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
PreReq: PEAR-Auth_SASL >= 1.0.2
-PreReq: horde-framework-kolab >= %{V_version}
+PreReq: horde-framework-kolab >= 3.1.4.99
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo Makefile, 1.4,
1.5 horde-ingo-kolab.spec, 1.5, 1.6
Message-ID: <20070803073810.2643960AE47@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv5965/horde/horde-ingo
Modified Files:
Makefile horde-ingo-kolab.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 2 Aug 2007 07:57:13 -0000 1.4
+++ Makefile 3 Aug 2007 07:38:08 -0000 1.5
@@ -19,8 +19,8 @@
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/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
TEMPLATES = $(shell find . -name "*.template")
Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-ingo-kolab.spec 23 Jul 2007 16:06:42 -0000 1.5
+++ horde-ingo-kolab.spec 3 Aug 2007 07:38:08 -0000 1.6
@@ -2,11 +2,11 @@
%define V_horde_name ingo
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2007
-%define V_month 07
-%define V_day 23
-%define V_version %{V_year}%{V_month}%{V_day}
+%define V_month 08
+%define V_day 03
+%define V_version 1.1.3.99
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release 1
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
@@ -34,7 +34,7 @@
BuildPreReq: php, php::with_pear = yes
PreReq: php, php::with_pear = yes
PreReq: PEAR-Net_Sieve >= 1.1.5
-PreReq: horde-framework-kolab >= %{V_version}
+PreReq: horde-framework-kolab >= 3.1.4.99
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Aug 3 09:38:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 09:38:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-kolab-client Makefile, 1.2,
1.3 horde-kolab-client.spec, 1.2, 1.3
Message-ID: <20070803073810.2B1E960AE48@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kolab-client
In directory doto:/tmp/cvs-serv5965/horde/horde-kolab-client
Modified Files:
Makefile horde-kolab-client.spec
Log Message:
Prepared the horde packages for a first test installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-kolab-client/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 2 Aug 2007 07:57:13 -0000 1.2
+++ Makefile 3 Aug 2007 07:38:08 -0000 1.3
@@ -18,8 +18,8 @@
DATE = ${YEAR}-${MONTH}-${DAY}
-VERSION = ${YEAR}${MONTH}${DAY}
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
Index: horde-kolab-client.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kolab-client/horde-kolab-client.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-kolab-client.spec 23 Jul 2007 16:06:42 -0000 1.2
+++ horde-kolab-client.spec 3 Aug 2007 07:38:08 -0000 1.3
@@ -1,11 +1,11 @@
# Versions
%define V_package horde-kolab-client
%define V_year 2007
-%define V_month 07
-%define V_day 23
-%define V_version %{V_year}%{V_month}%{V_day}
+%define V_month 08
+%define V_day 03
+%define V_version 0.99
%define V_date %{V_year}-%{V_month}-%{V_day}
-%define V_release 1
+%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
Name: %{V_package}
@@ -27,15 +27,15 @@
BuildRoot: %{l_buildroot}
#Pre requisites
-PreReq: horde-framework-kolab >= %{V_version}
-PreReq: horde-kolab >= %{V_version}
-PreReq: horde-imp-kolab >= %{V_version}
-PreReq: horde-ingo-kolab >= %{V_version}
-PreReq: horde-kronolith-kolab >= %{V_version}
-PreReq: horde-mnemo-kolab >= %{V_version}
-PreReq: horde-nag-kolab >= %{V_version}
-PreReq: horde-passwd-kolab >= %{V_version}
-PreReq: horde-turba-kolab >= %{V_version}
+PreReq: horde-framework-kolab >= 3.1.4.99-%{V_release}
+PreReq: horde-kolab >= 3.1.4.99-%{V_release}
+PreReq: horde-imp-kolab >= 4.1.4.99-%{V_release}
+PreReq: horde-ingo-kolab >= 1.1.3.99-%{V_release}
+PreReq: horde-kronolith-kolab >= 2.1.5.99-%{V_release}
+PreReq: horde-mnemo-kolab >= 2.1.1.99-%{V_release}
+PreReq: horde-nag-kolab >= 2.1.3.99-%{V_release}
+PreReq: horde-passwd-kolab >= 3.0.1.99-%{V_release}
+PreReq: horde-turba-kolab >= 2.1.4.99-%{V_release}
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Fri Aug 3 12:32:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 12:32:45 +0200 (CEST)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
freebusy.conf, 1.4, 1.5
Message-ID: <20070803103245.E48A160AE47@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv13030
Modified Files:
freebusy.conf
Log Message:
Sync the conf file with the template in kolabd.
Index: freebusy.conf
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- freebusy.conf 2 Mar 2007 04:39:40 -0000 1.4
+++ freebusy.conf 3 Aug 2007 10:32:43 -0000 1.5
@@ -1,17 +1,23 @@
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv13080
Modified Files:
freebusy.conf.template.in
Log Message:
Sync thes comments in this template with the file in kolab-resource-handlers.
Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- freebusy.conf.template.in 2 Mar 2007 04:40:21 -0000 1.8
+++ freebusy.conf.template.in 3 Aug 2007 10:33:27 -0000 1.9
@@ -8,7 +8,8 @@
// Kolab prefix
$params['kolab_prefix'] = '@prefix@';
-// The name of _this_ server
+// What is the address of the Cyrus server where the calendar data is stored?
+// This is also used as the LDAP server address where user objects reside
$params['server'] = '@@@fqdnhostname@@@';
// What is the address of the LDAP server address where user objects reside
@@ -17,8 +18,10 @@
// What is the Base DN of our LDAP database?
$params['base_dn'] = '@@@base_dn@@@';
-// DN and pw to use for LDAP access
+// What DN should we use to bind to the LDAP server?
$params['bind_dn'] = '@@@php_dn@@@';
+
+// What password should we use with the above DN when binding?
$params['bind_pw'] = '@@@php_pw@@@';
// Are we using a multi-location setup? If this is true, we check the users'
@@ -102,3 +105,21 @@
// don't change this if you don't have to
//$params['ldap_classname_suffix'] = "_dummy";
+
+// Activate if you wish to use the new horde framework
+// (horde-framework-kolab) package instead of the old code in
+// kolab-horde-framework. This is still untested and considered
+// UNSAFE!
+$params['use_new_horde'] = false;
+
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//
+// If you modify this file, please do not forget to modify both the
+// template and the source file in kolab-resource-handler.
+//
+// In order to check if both are in sync:
+//
+// cd server
+// diff -Nau kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.conf kolabd/kolabd/templates/freebusy.conf.template.in
+//
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/fbview-kronolith fbview-kronolith.spec,1.6,1.7
Message-ID: <20070803114006.1C876600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv24332/horde/fbview-kronolith
Modified Files:
fbview-kronolith.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fbview-kronolith.spec 3 Aug 2007 07:38:08 -0000 1.6
+++ fbview-kronolith.spec 3 Aug 2007 11:40:04 -0000 1.7
@@ -81,7 +81,7 @@
delete.php ics.php search.php week.php contacts.php \
imple.php month.php pref_api.php workweek.php \
edit.php new.php test.php year.php attend.php \
- data.php event.php
+ data.php event.php && cd ..
cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server install-kolab.sh,1.3,1.4
Message-ID: <20070803114006.17F8B600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24332
Modified Files:
install-kolab.sh
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- install-kolab.sh 2 Aug 2007 08:39:21 -0000 1.3
+++ install-kolab.sh 3 Aug 2007 11:40:04 -0000 1.4
@@ -16,6 +16,7 @@
FLAG_ENV=""
FLAG_CLEAN=""
FLAG_FBVIEW=""
+FLAG_HORDE=""
usage() {
echo "Usage:"
@@ -27,6 +28,7 @@
echo
echo "Options:"
echo
+ echo " -H (install the Horde groupware web client)"
echo " -F (install the free/busy view frontend)"
echo
echo " -h (display this help)"
@@ -83,6 +85,9 @@
F) # User wants to install fbview
FLAG_FBVIEW="Yes"
;;
+ H) # User wants to install Horde
+ FLAG_HORDE="Yes"
+ ;;
c) # User wants to erase the openpkg environment
FLAG_CLEAN="Yes"
;;
@@ -100,6 +105,10 @@
if [ -z "$USER" ]; then
USER=$TAG
+fi
+
+if [ -n "$FLAG_HORDE" ]; then
+ PACKAGES="$PACKAGES horde-kolab-client"
fi
if [ -n "$FLAG_FBVIEW" ]; then
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith horde-kronolith-kolab.spec, 1.7,
1.8
Message-ID: <20070803114006.4061360AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv24332/horde/horde-kronolith
Modified Files:
horde-kronolith-kolab.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde-kronolith-kolab.spec 3 Aug 2007 07:38:08 -0000 1.7
+++ horde-kronolith-kolab.spec 3 Aug 2007 11:40:04 -0000 1.8
@@ -4,8 +4,8 @@
%define V_year 2007
%define V_month 08
%define V_day 03
-%define V_version 2.1.5.99
-%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_version 2.1.5.99
+%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba horde-turba-kolab.spec,1.7,1.8
Message-ID: <20070803114006.50DCD60AE5B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv24332/horde/horde-turba
Modified Files:
horde-turba-kolab.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde-turba-kolab.spec 3 Aug 2007 07:38:08 -0000 1.7
+++ horde-turba-kolab.spec 3 Aug 2007 11:40:04 -0000 1.8
@@ -4,8 +4,8 @@
%define V_year 2007
%define V_month 08
%define V_day 03
-%define V_version 2.1.4.99
-%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_version 2.1.4.99
+%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo horde-mnemo-kolab.spec,1.6,1.7
Message-ID: <20070803114006.4426D60AE4E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv24332/horde/horde-mnemo
Modified Files:
horde-mnemo-kolab.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: horde-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- horde-mnemo-kolab.spec 3 Aug 2007 07:38:08 -0000 1.6
+++ horde-mnemo-kolab.spec 3 Aug 2007 11:40:04 -0000 1.7
@@ -4,8 +4,8 @@
%define V_year 2007
%define V_month 08
%define V_day 03
-%define V_version 2.1.1.99
-%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_version 2.1.1.99
+%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo horde-ingo-kolab.spec,1.6,1.7
Message-ID: <20070803114006.38819600175@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv24332/horde/horde-ingo
Modified Files:
horde-ingo-kolab.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- horde-ingo-kolab.spec 3 Aug 2007 07:38:08 -0000 1.6
+++ horde-ingo-kolab.spec 3 Aug 2007 11:40:04 -0000 1.7
@@ -4,8 +4,8 @@
%define V_year 2007
%define V_month 08
%define V_day 03
-%define V_version 1.1.3.99
-%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_version 1.1.3.99
+%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag horde-nag-kolab.spec,1.6,1.7
Message-ID: <20070803114006.4717260AE52@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv24332/horde/horde-nag
Modified Files:
horde-nag-kolab.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: horde-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- horde-nag-kolab.spec 3 Aug 2007 07:38:08 -0000 1.6
+++ horde-nag-kolab.spec 3 Aug 2007 11:40:04 -0000 1.7
@@ -4,8 +4,8 @@
%define V_year 2007
%define V_month 08
%define V_day 03
-%define V_version 2.1.3.99
-%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_version 2.1.3.99
+%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/horde-kolab-client Makefile, 1.3,
1.4 horde-kolab-client.spec, 1.3, 1.4
Message-ID: <20070803114006.3E72660AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kolab-client
In directory doto:/tmp/cvs-serv24332/horde/horde-kolab-client
Modified Files:
Makefile horde-kolab-client.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-kolab-client/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 3 Aug 2007 07:38:08 -0000 1.3
+++ Makefile 3 Aug 2007 11:40:04 -0000 1.4
@@ -18,7 +18,7 @@
DATE = ${YEAR}-${MONTH}-${DAY}
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9]*\).*/\1/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = ${YEAR}${MONTH}${DAY}
.PHONY: all
Index: horde-kolab-client.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kolab-client/horde-kolab-client.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde-kolab-client.spec 3 Aug 2007 07:38:08 -0000 1.3
+++ horde-kolab-client.spec 3 Aug 2007 11:40:04 -0000 1.4
@@ -3,8 +3,8 @@
%define V_year 2007
%define V_month 08
%define V_day 03
-%define V_version 0.99
-%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_version 0.99
+%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd horde-passwd-kolab.spec,1.6,1.7
Message-ID: <20070803114006.49E4860AE58@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv24332/horde/horde-passwd
Modified Files:
horde-passwd-kolab.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- horde-passwd-kolab.spec 3 Aug 2007 07:38:08 -0000 1.6
+++ horde-passwd-kolab.spec 3 Aug 2007 11:40:04 -0000 1.7
@@ -4,8 +4,8 @@
%define V_year 2007
%define V_month 08
%define V_day 03
-%define V_version 3.0.1.99
-%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_version 3.0.1.99
+%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/horde horde-kolab.spec,1.6,1.7
Message-ID: <20070803114006.202B260AE49@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv24332/horde/horde
Modified Files:
horde-kolab.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- horde-kolab.spec 3 Aug 2007 07:38:08 -0000 1.6
+++ horde-kolab.spec 3 Aug 2007 11:40:04 -0000 1.7
@@ -59,6 +59,7 @@
%install
rm -rf $RPM_BUILD_ROOT
+ %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/apache2/log/horde
%{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
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp horde-imp-kolab.spec,1.7,1.8
Message-ID: <20070803114006.35C22600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv24332/horde/horde-imp
Modified Files:
horde-imp-kolab.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde-imp-kolab.spec 3 Aug 2007 07:38:08 -0000 1.7
+++ horde-imp-kolab.spec 3 Aug 2007 11:40:04 -0000 1.8
@@ -4,8 +4,8 @@
%define V_year 2007
%define V_month 08
%define V_day 03
-%define V_version 4.1.4.99
-%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_version 4.1.4.99
+%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
From cvs at kolab.org Fri Aug 3 13:40:06 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:40:06 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework Makefile, 1.7,
1.8 horde-framework-kolab.spec, 1.10, 1.11
Message-ID: <20070803114006.24D4D60AE4B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv24332/horde/horde-framework
Modified Files:
Makefile horde-framework-kolab.spec
Log Message:
Horde snapshots are available. Some minor spec fixes were necessary to get the packages built correctly.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile 3 Aug 2007 07:38:08 -0000 1.7
+++ Makefile 3 Aug 2007 11:40:04 -0000 1.8
@@ -19,7 +19,7 @@
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = horde-$(HORDE_NAME)-kolab
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9]*\).*/\1/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = ${YEAR}${MONTH}${DAY}
PATCHES = $(shell find . -name "*.patch")
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- horde-framework-kolab.spec 3 Aug 2007 07:38:08 -0000 1.10
+++ horde-framework-kolab.spec 3 Aug 2007 11:40:04 -0000 1.11
@@ -4,8 +4,8 @@
%define V_year 2007
%define V_month 08
%define V_day 03
-%define V_version 3.1.4.99
-%define V_date %{V_year}-%{V_month}-%{V_day}
+%define V_version 3.1.4.99
+%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
# Package Information
From cvs at kolab.org Fri Aug 3 13:52:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 3 Aug 2007 13:52:01 +0200 (CEST)
Subject: gunnar: server install-kolab.sh,1.4,1.5
Message-ID: <20070803115201.0B24160AE44@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24705
Modified Files:
install-kolab.sh
Log Message:
Forgot to add the H flag to the getops call.
Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- install-kolab.sh 3 Aug 2007 11:40:04 -0000 1.4
+++ install-kolab.sh 3 Aug 2007 11:51:59 -0000 1.5
@@ -53,7 +53,7 @@
exit 1
}
-while getopts hcBDSEFi:V:p:I:u:t: ARGS; do
+while getopts hcBDSEFHi:V:p:I:u:t: ARGS; do
case $ARGS in
h) # Display help
usage
From cvs at kolab.org Sun Aug 5 07:40:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:40:22 +0200 (CEST)
Subject: gunnar: server/apache2-php - New directory
Message-ID: <20070805054022.5DE7E60016F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/apache2-php
In directory doto:/tmp/cvs-serv407/apache2-php
Log Message:
Directory /kolabrepository/server/apache2-php added to the repository
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/fbview-kronolith fbview-kronolith.spec,1.7,1.8
Message-ID: <20070805054223.67EF560016E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv507/horde/fbview-kronolith
Modified Files:
fbview-kronolith.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fbview-kronolith.spec 3 Aug 2007 11:40:04 -0000 1.7
+++ fbview-kronolith.spec 5 Aug 2007 05:42:21 -0000 1.8
@@ -45,10 +45,12 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
PreReq: fbview-horde >= 3.1.4.99
-PreReq: horde-framework-kolab >= 3.1.4.99
PreReq: PEAR-Date >= 1.4.7
+
+#FIXME (Optional)
+#PreReq: PEAR-Date_Holidays >= 0.17.1
+#PreReq: PEAR-XML_Serializer
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/horde-framework horde-framework-kolab.spec, 1.11,
1.12
Message-ID: <20070805054223.777F1600171@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv507/horde/horde-framework
Modified Files:
horde-framework-kolab.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- horde-framework-kolab.spec 3 Aug 2007 11:40:04 -0000 1.11
+++ horde-framework-kolab.spec 5 Aug 2007 05:42:21 -0000 1.12
@@ -45,8 +45,7 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
-
+PreReq: kolabd::with_horde
AutoReq: no
AutoReqProv: no
#BuildArch: noarch
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server Makefile,1.31,1.32 install-kolab.sh,1.5,1.6
Message-ID: <20070805054223.5C97C60016D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv507
Modified Files:
Makefile install-kolab.sh
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile 2 Aug 2007 08:25:18 -0000 1.31
+++ Makefile 5 Aug 2007 05:42:21 -0000 1.32
@@ -10,7 +10,7 @@
endif
ifeq "x$(KOLABPKGURI)" "x"
- export KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.1/openpkg-orig-srpms/
+ export KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.2/20070612-full/sources
endif
ifeq "x$(RPM)" "x"
export RPM = $(HOME)/bin/openpkg rpm
@@ -26,6 +26,8 @@
endif
BASE_PACKAGES=openldap \
+ apache2-php \
+ php \
php-smarty
KOLAB_PACKAGES=perl-kolab \
Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- install-kolab.sh 3 Aug 2007 11:51:59 -0000 1.5
+++ install-kolab.sh 5 Aug 2007 05:42:21 -0000 1.6
@@ -10,6 +10,7 @@
INSTALL=""
PACKAGES="openpkg-tools kolabd kolab-webadmin kolab-resource-handlers"
+DEFINE=""
#Flags
FLAG_BASE=""
@@ -108,6 +109,7 @@
fi
if [ -n "$FLAG_HORDE" ]; then
+ DEFINE="$DEFINE -D kolabd::with_horde"
PACKAGES="$PACKAGES horde-kolab-client"
fi
@@ -281,6 +283,7 @@
[ -z "$PLATTAG" ] && PLATTAG=`"$PREFIX/lib/openpkg/shtool" platform --type=binary`-$TAG
if [ -n "$KOLAB_VERSION" ]; then
DEFINE="
+ $DEFINE
-Dkolabd::kolab_version=$KOLAB_VERSION
-Dkolab-webadmin::kolab_version=$KOLAB_VERSION
"
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/horde horde-kolab.spec,1.7,1.8
Message-ID: <20070805054223.68CCC600170@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv507/horde/horde
Modified Files:
horde-kolab.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde-kolab.spec 3 Aug 2007 11:40:04 -0000 1.7
+++ horde-kolab.spec 5 Aug 2007 05:42:21 -0000 1.8
@@ -34,11 +34,18 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= 3.1.4.99
PreReq: PEAR-Mail_Mime >= 1.3.1
PreReq: PEAR-Mail >= 1.1.14
PreReq: PEAR-Log >= 1.9.9
-PreReq: horde-framework-kolab >= 3.1.4.99
+
+#FIXME (Optional)
+#PreReq: PEAR-File
+#PreReq: PEAR-Services_Weather
+#PreReq: PECL-fileinfo
+#PreReq: PECL-json
+#PreReq: PECL-memcache
+#PreReq: PECL-lzf
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/horde-kronolith horde-kronolith-kolab.spec, 1.8,
1.9
Message-ID: <20070805054223.8711760AE67@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv507/horde/horde-kronolith
Modified Files:
horde-kronolith-kolab.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- horde-kronolith-kolab.spec 3 Aug 2007 11:40:04 -0000 1.8
+++ horde-kronolith-kolab.spec 5 Aug 2007 05:42:21 -0000 1.9
@@ -32,9 +32,12 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
PreReq: horde-kolab >= 3.1.4.99
PreReq: PEAR-Date >= 1.4.7
+
+#FIXME (Optional)
+#PreReq: PEAR-Date_Holidays >= 0.17.1
+#PreReq: PEAR-XML_Serializer
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/horde-imp horde-imp-kolab.spec,1.8,1.9
Message-ID: <20070805054223.84A7F60AE66@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv507/horde/horde-imp
Modified Files:
horde-imp-kolab.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- horde-imp-kolab.spec 3 Aug 2007 11:40:04 -0000 1.8
+++ horde-imp-kolab.spec 5 Aug 2007 05:42:21 -0000 1.9
@@ -32,9 +32,11 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
-PreReq: PEAR-Auth_SASL >= 1.0.2
PreReq: horde-framework-kolab >= 3.1.4.99
+PreReq: PEAR-Auth_SASL >= 1.0.2
+# FIXME (optional)
+#PreReq: PEAR-HTTP_Request
+#PreReq: PECL-idn
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd horde-passwd-kolab.spec,1.7,1.8
Message-ID: <20070805054223.8D46360AE6C@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv507/horde/horde-passwd
Modified Files:
horde-passwd-kolab.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde-passwd-kolab.spec 3 Aug 2007 11:40:04 -0000 1.7
+++ horde-passwd-kolab.spec 5 Aug 2007 05:42:21 -0000 1.8
@@ -31,7 +31,6 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
PreReq: horde-kolab >= 3.1.4.99
AutoReq: no
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/fbview-horde fbview-horde.spec,1.5,1.6
Message-ID: <20070805054223.8BC8060AE6B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv507/horde/fbview-horde
Modified Files:
fbview-horde.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: fbview-horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fbview-horde.spec 3 Aug 2007 07:38:07 -0000 1.5
+++ fbview-horde.spec 5 Aug 2007 05:42:21 -0000 1.6
@@ -35,10 +35,18 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
+PreReq: horde-framework-kolab >= 3.1.4.99
PreReq: PEAR-Mail_Mime >= 1.3.1
PreReq: PEAR-Mail >= 1.1.14
-PreReq: horde-framework-kolab >= 3.1.4.99
+PreReq: PEAR-Log >= 1.9.9
+
+#FIXME (Optional)
+#PreReq: PEAR-File
+#PreReq: PEAR-Services_Weather
+#PreReq: PECL-fileinfo
+#PreReq: PECL-json
+#PreReq: PECL-memcache
+#PreReq: PECL-lzf
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/horde-ingo horde-ingo-kolab.spec,1.7,1.8
Message-ID: <20070805054223.893C960AE6A@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv507/horde/horde-ingo
Modified Files:
horde-ingo-kolab.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde-ingo-kolab.spec 3 Aug 2007 11:40:04 -0000 1.7
+++ horde-ingo-kolab.spec 5 Aug 2007 05:42:21 -0000 1.8
@@ -32,9 +32,8 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
-PreReq: PEAR-Net_Sieve >= 1.1.5
PreReq: horde-framework-kolab >= 3.1.4.99
+PreReq: PEAR-Net_Sieve >= 1.1.5
AutoReq: no
AutoReqProv: no
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/apache2-php Makefile,NONE,1.1 kolab.patch,NONE,1.1
Message-ID: <20070805054223.88C5460AE69@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/apache2-php
In directory doto:/tmp/cvs-serv507/apache2-php
Added Files:
Makefile kolab.patch
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
--- NEW FILE: Makefile ---
PACKAGE=apache2-php
VERSION=5.2.3
RELEASE=20070606
KOLABRELEASE=20070606_kolab
ifeq "x$(KOLABPKGURI)" "x"
KOLABPKGURI = http://ftp.belnet.be/packages/kolab/server/development-2.2/20070612-full/sources
endif
ifeq "x$(RPM)" "x"
RPM = $(HOME)/bin/openpkg rpm
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
KOLABRPMPKG = $(HOME)/RPM/PKG
endif
ifeq "x$(KOLABRPMTMP)" "x"
KOLABRPMTMP = $(HOME)/RPM/TMP
endif
ifeq "x$(KOLABCVSDIR)" "x"
KOLABCVSDIR = $(CURDIR)
endif
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
PATCHES=
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
.PHONY: dist
dist: all
cp $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
.PHONY: clean
clean:
rm -rf $(KOLABRPMTMP)/$(PACKAGE)
rm -rf $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
rm -rf *~
$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) $(KOLABCVSDIR)/kolab.patch Makefile
$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for apache2-php.spec
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
--- NEW FILE: kolab.patch ---
--- apache2-php.spec.orig 2007-06-06 14:25:30.000000000 +0200
+++ apache2-php.spec 2007-08-03 15:33:57.000000000 +0200
@@ -39,7 +39,7 @@
Group: Web
License: PHP
Version: %{V_php}
-Release: 20070606
+Release: 20070606_kolab
# package options
%option with_suhosin no
@@ -48,6 +48,7 @@
%option with_bdb no
%option with_bzip2 no
%option with_calendar no
+%option with_ctype no
%option with_curl no
%option with_debug no
%option with_dom no
@@ -469,6 +470,9 @@
%if "%{with_mcrypt}" == "yes"
--with-mcrypt=%{l_prefix} \
%endif
+%if "%{with_ctype}" == "yes"
+ --enable-ctype \
+%endif
%if "%{with_curl}" == "yes"
--with-curl=%{l_prefix} \
%endif
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/horde-nag horde-nag-kolab.spec,1.7,1.8
Message-ID: <20070805054223.936EA60AE6F@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv507/horde/horde-nag
Modified Files:
horde-nag-kolab.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: horde-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde-nag-kolab.spec 3 Aug 2007 11:40:04 -0000 1.7
+++ horde-nag-kolab.spec 5 Aug 2007 05:42:21 -0000 1.8
@@ -31,7 +31,6 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
PreReq: horde-kolab >= 3.1.4.99
AutoReq: no
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/horde-turba horde-turba-kolab.spec,1.8,1.9
Message-ID: <20070805054223.8E22D60AE6D@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv507/horde/horde-turba
Modified Files:
horde-turba-kolab.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- horde-turba-kolab.spec 3 Aug 2007 11:40:04 -0000 1.8
+++ horde-turba-kolab.spec 5 Aug 2007 05:42:21 -0000 1.9
@@ -51,7 +51,6 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
PreReq: horde-kolab >= 3.1.4.99
AutoReq: no
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/php Makefile,1.8,1.9 kolab.patch,1.5,1.6
Message-ID: <20070805054223.94C6160AE70@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/php
In directory doto:/tmp/cvs-serv507/php
Added Files:
Makefile kolab.patch
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/horde/horde-mnemo horde-mnemo-kolab.spec,1.7,1.8
Message-ID: <20070805054223.87EA360AE68@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv507/horde/horde-mnemo
Modified Files:
horde-mnemo-kolab.spec
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: horde-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde-mnemo-kolab.spec 3 Aug 2007 11:40:04 -0000 1.7
+++ horde-mnemo-kolab.spec 5 Aug 2007 05:42:21 -0000 1.8
@@ -31,7 +31,6 @@
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: php, php::with_pear = yes
PreReq: horde-kolab >= 3.1.4.99
AutoReq: no
From cvs at kolab.org Sun Aug 5 07:42:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:42:23 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd kolabd.spec.in,1.13,1.14
Message-ID: <20070805054223.8EC6760AE6E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv507/kolabd/kolabd
Modified Files:
kolabd.spec.in
Log Message:
Fixed all the PHP requirements for a complete Horde installation.
Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kolabd.spec.in 2 Aug 2007 10:34:38 -0000 1.13
+++ kolabd.spec.in 5 Aug 2007 05:42:21 -0000 1.14
@@ -45,6 +45,9 @@
Source0: kolabd-%{version}.tar.bz2
#Source1: rc.kolabd
+# package options
+%option with_horde no
+
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
@@ -56,9 +59,18 @@
PreReq: amavisd
PreReq: clamav >= 0.90
PreReq: imap, imap::with_annotate = yes
-PreReq: php, php::with_zlib = yes, php::with_bdb = yes, php::with_gettext = yes, php::with_imap = yes, php::with_imap_annotate = yes, php::with_openldap = yes, php::with_pear = yes, php::with_xml = yes, php::with_dom = yes, php::with_ssl = yes, php::with_mbstring = yes, php::with_mm = yes
PreReq: apache2, apache2::with_mod_dav = yes, apache2::with_mod_ssl = yes, apache2::with_mod_ldap = yes
+
+%if "%{with_horde}" == "yes"
+# FIXME (optional)
+# what about php::with_tidy = yes (for Horde Imp)
+PreReq: php, php::with_pear = yes, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_mhash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes
+PreReq: apache2-php, apache2-php::with_gettext = yes, apache2-php::with_dom = yes, apache2-php::with_mcrypt = yes, apache2-php::with_iconv = yes, apache2-php::with_mbstring = yes, apache2-php::with_mbregex = yes, apache2-php::with_gd = yes, apache2-php::with_imap = yes, apache2-php::with_ssl = yes, apache2-php::with_ctype = yes, apache2-php::with_openldap = yes, apache2-php::with_mhash = yes, apache2-php::with_zlib = yes, apache2-php::with_bdb = yes, apache2-php::with_imap_annotate = yes, apache2-php::with_pear = yes, apache2-php::with_xml = yes, apache2-php::with_mm = yes
+%else
+PreReq: php, php::with_zlib = yes, php::with_bdb = yes, php::with_gettext = yes, php::with_imap = yes, php::with_imap_annotate = yes, php::with_openldap = yes, php::with_pear = yes, php::with_xml = yes, php::with_dom = yes, php::with_ssl = yes, php::with_mbstring = yes, php::with_mm = yes
PreReq: apache2-php, apache2-php::with_zlib = yes, apache2-php::with_bdb = yes, apache2-php::with_gettext = yes, apache2-php::with_imap = yes, apache2-php::with_imap_annotate = yes, apache2-php::with_openldap = yes, apache2-php::with_pear = yes, apache2-php::with_xml = yes, apache2-php::with_dom = yes, apache2-php::with_ssl = yes, apache2-php::with_mbstring = yes, apache2-php::with_mm = yes
+%endif
+
PreReq: imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes
PreReq: proftpd, proftpd::with_ldap = yes
PreReq: perl-ssl
From cvs at kolab.org Sun Aug 5 07:53:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:53:10 +0200 (CEST)
Subject: gunnar: server/horde/horde conf.php,1.3,1.4
Message-ID: <20070805055310.0B37A60016E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv865/horde
Modified Files:
conf.php
Log Message:
Location of the horde log file modified. Fixed kolab/issue1865.
Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/horde/conf.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- conf.php 3 Aug 2007 07:38:08 -0000 1.3
+++ conf.php 5 Aug 2007 05:53:08 -0000 1.4
@@ -29,7 +29,7 @@
$conf['log']['priority'] = PEAR_LOG_NOTICE;
$conf['log']['ident'] = 'HORDE';
$conf['log']['params'] = array();
-$conf['log']['name'] = '/kolab/var/apache2/log/fbview/fbview.log';
+$conf['log']['name'] = '/kolab/var/apache2/log/horde/horde.log';
$conf['log']['params']['append'] = true;
$conf['log']['type'] = 'file';
$conf['log']['enabled'] = true;
From cvs at kolab.org Sun Aug 5 07:53:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 07:53:10 +0200 (CEST)
Subject: gunnar: server/horde/horde-passwd backends.php, NONE, 1.1 ChangeLog,
1.3, 1.4 horde-passwd-kolab.spec, 1.8, 1.9
Message-ID: <20070805055310.11E00600170@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv865/horde-passwd
Modified Files:
ChangeLog horde-passwd-kolab.spec
Added Files:
backends.php
Log Message:
Location of the horde log file modified. Fixed kolab/issue1865.
--- NEW FILE: backends.php ---
'Local Kolab Server',
'preferred' => '',
'password policy' => array(
'minLength' => 3,
'maxLength' => 8
),
'driver' => 'kolab',
'params' => array()
);
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog 20 Jul 2007 11:19:08 -0000 1.3
+++ ChangeLog 5 Aug 2007 05:53:08 -0000 1.4
@@ -1,3 +1,9 @@
+2007-08-05 Gunnar Wrobel
+
+ * horde-passwd-kolab.spec: Add backends.php configuration. Fixes
+ kolab/issue1865 ([horde passwd] Failure in changing password on
+ Horde Authentication: Unable to connect to SQL server.)
+
2007-07-19 Gunnar Wrobel
* horde-passwd-kolab.spec: Update to 20070719
Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- horde-passwd-kolab.spec 5 Aug 2007 05:42:21 -0000 1.8
+++ horde-passwd-kolab.spec 5 Aug 2007 05:53:08 -0000 1.9
@@ -23,6 +23,7 @@
# 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}
@@ -60,11 +61,12 @@
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} \
+ %{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'
+ %{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
From cvs at kolab.org Sun Aug 5 08:25:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 5 Aug 2007 08:25:42 +0200 (CEST)
Subject: gunnar: server Makefile,1.32,1.33
Message-ID: <20070805062542.F1AA860016E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv1876
Modified Files:
Makefile
Log Message:
kolab-horde-fbview does not exist anymore.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile 5 Aug 2007 05:42:21 -0000 1.32
+++ Makefile 5 Aug 2007 06:25:40 -0000 1.33
@@ -33,7 +33,6 @@
KOLAB_PACKAGES=perl-kolab \
kolabconf \
kolabd \
- kolab-horde-fbview \
kolab-horde-framework \
kolab-resource-handlers \
kolab-webadmin \
From cvs at kolab.org Tue Aug 7 13:40:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 7 Aug 2007 13:40:17 +0200 (CEST)
Subject: gunnar: server/kolabconf/lib/Kolab Conf.pm,1.4,1.5
Message-ID: <20070807114017.172BD60AE7B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv23637/kolabconf/lib/Kolab
Modified Files:
Conf.pm
Log Message:
Added with_horde support to kolabd. And a fix in kolabconf: kolab/issue1879 (kolabconf poor error message in buildCyrusConfig)
Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Conf.pm 2 Aug 2007 06:43:10 -0000 1.4
+++ Conf.pm 7 Aug 2007 11:40:15 -0000 1.5
@@ -75,12 +75,12 @@
my $gid = (getgrnam($group))[2];
Kolab::log('T', sprintf("Changing permissions of %s to 0%o", $file, $perm ), KOLAB_DEBUG );
if( chmod($perm, $file) != 1 ) {
- Kolab::log('T', "Unable to change permissions of `$file' to ".sprintf("0%o",$perm), KOLAB_ERROR);
+ Kolab::log('T', "Unable to change permissions of `$file' to ".sprintf("0%o",$perm) . ": $!", KOLAB_ERROR);
exit(1);
}
Kolab::log('T', "Changing owner of $file to $owner:$group ($uid:$gid)", KOLAB_DEBUG );
if( chown($uid,$gid,$file) != 1 ) {
- Kolab::log('T', "Unable to change ownership of `$file' to $uid:$gid", KOLAB_ERROR);
+ Kolab::log('T', "Unable to change ownership of `$file' to $uid:$gid: $!", KOLAB_ERROR);
exit(1);
}
}
@@ -116,7 +116,7 @@
my $template;
if (!($template = IO::File->new($tmpl, 'r'))) {
- Kolab::log('T', "Unable to open template file `$tmpl'", KOLAB_ERROR);
+ Kolab::log('T', "Unable to open template file `$tmpl': $!", KOLAB_ERROR);
# Error, fail gracefully
return;
}
@@ -125,7 +125,7 @@
DIR => $Kolab::config{"kolabdir"},
SUFFIX => '.kolabtmp',
UNLINK => 0 ))) {
- Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+ Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
exit(1);
}
@@ -288,7 +288,7 @@
my $transport;
if (!($transport = IO::File->new($cfg, 'a'))) {
- Kolab::log('T', "Unable to create Postfix $map map", KOLAB_ERROR);
+ Kolab::log('T', "Unable to create Postfix $map map: $!", KOLAB_ERROR);
exit(1);
}
@@ -366,12 +366,12 @@
my $cyrusconf;
my $cyrustemplate;
if (!($cyrustemplate = IO::File->new($keytemplate, 'r'))) {
- Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+ Kolab::log('T', "Unable to open configuration file `$keytemplate': $!", KOLAB_ERROR);
exit(1);
}
if (!($cyrusconf = IO::File->new($cfg, 'w'))) {
- Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+ Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
exit(1);
}
@@ -444,7 +444,7 @@
my $groupconf;
if (!($groupconf = IO::File->new($cfg, 'a'))) {
- Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+ Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
exit(1);
}
@@ -513,7 +513,7 @@
my $access;
if (!($access = IO::File->new($cfg, 'a'))) {
- Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+ Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
exit(1);
}
@@ -606,7 +606,7 @@
my $repl;
if (!($repl = IO::File->new($cfg, 'a'))) {
- Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+ Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
exit(1);
}
From cvs at kolab.org Tue Aug 7 13:40:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 7 Aug 2007 13:40:17 +0200 (CEST)
Subject: gunnar: server/kolabconf Changes,1.2,1.3
Message-ID: <20070807114017.1817760C4AC@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabconf
In directory doto:/tmp/cvs-serv23637/kolabconf
Modified Files:
Changes
Log Message:
Added with_horde support to kolabd. And a fix in kolabconf: kolab/issue1879 (kolabconf poor error message in buildCyrusConfig)
Index: Changes
===================================================================
RCS file: /kolabrepository/server/kolabconf/Changes,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Changes 1 Aug 2007 14:31:35 -0000 1.2
+++ Changes 7 Aug 2007 11:40:15 -0000 1.3
@@ -1,3 +1,10 @@
+2007-08-07 Gunnar Wrobel
+
+ * Conf.pm:
+
+ Fixed kolab/issue1879 (kolabconf poor error message in buildCyrusConfig)
+ https://intevation.de/roundup/kolab/issue1879
+
2007-08-01 Gunnar Wrobel
Created the kolabconf package by moving kolabconf and the
From cvs at kolab.org Tue Aug 7 13:40:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 7 Aug 2007 13:40:17 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.108, 1.109 kolabd.spec.in,
1.14, 1.15
Message-ID: <20070807114017.180A860C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv23637/kolabd/kolabd
Modified Files:
ChangeLog kolabd.spec.in
Log Message:
Added with_horde support to kolabd. And a fix in kolabconf: kolab/issue1879 (kolabconf poor error message in buildCyrusConfig)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- ChangeLog 2 Aug 2007 10:34:38 -0000 1.108
+++ ChangeLog 7 Aug 2007 11:40:15 -0000 1.109
@@ -1,3 +1,9 @@
+2007-08-05 Gunnar Wrobel
+
+ * kolabd.spec.in:
+
+ Added "with_horde" support.
+
2007-08-02 Gunnar Wrobel
* kolabd.spec.in:
Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolabd.spec.in 5 Aug 2007 05:42:21 -0000 1.14
+++ kolabd.spec.in 7 Aug 2007 11:40:15 -0000 1.15
@@ -100,6 +100,9 @@
%prep
%setup -q
+%if "%{with_horde}" == "yes"
+ sed -i -e 's/^#\(.*horde.*\)/\1/' templates/slapd.conf.template
+%endif
%build
./configure --prefix=%{l_prefix} --with-dist=kolab
From cvs at kolab.org Tue Aug 7 13:40:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 7 Aug 2007 13:40:17 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.144,1.145
Message-ID: <20070807114017.13BE760AE74@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv23637
Modified Files:
release-notes.txt
Log Message:
Added with_horde support to kolabd. And a fix in kolabconf: kolab/issue1879 (kolabconf poor error message in buildCyrusConfig)
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- release-notes.txt 2 Aug 2007 10:35:19 -0000 1.144
+++ release-notes.txt 7 Aug 2007 11:40:14 -0000 1.145
@@ -44,6 +44,9 @@
New package that holds the kolabconf script.
+ kolab/issue1879 (kolabconf poor error message in buildCyrusConfig)
+
+
- kolabd-2.1.99-2007????:
Added "discard" service to the postfix master.cf configuration.
@@ -64,6 +67,9 @@
Switched from displaying php errors to logging them
(recommended for production servers).
+
+ Added "with_horde" support.
+
Changes between 2.1.0 and 2.2-beta1:
From cvs at kolab.org Tue Aug 7 13:56:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 7 Aug 2007 13:56:58 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
domainmaintainer.php.in, 1.13, 1.14
Message-ID: <20070807115658.5EB2160AE7E@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
In directory doto:/tmp/cvs-serv24145/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
Modified Files:
domainmaintainer.php.in
Log Message:
kolab/issue1246 (Permission handling in the webadmin frontend)
https://intevation.de/roundup/kolab/issue1246
Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- domainmaintainer.php.in 12 Jul 2007 14:19:32 -0000 1.13
+++ domainmaintainer.php.in 7 Aug 2007 11:56:56 -0000 1.14
@@ -236,11 +236,13 @@
array_push($errors, sprintf(_("LDAP Error: could not modify object %s: %s"), $dn,
ldap_error($ldap->connection)));
}
- if( !$errors ) {
- $domains = $ldap->domainsForMaintainerDn($dn);
- $remove_domains = array_diff($domains,$_POST['domains']);
- $ldap->removeFromDomainGroups( $dn, $remove_domains );
+ if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) {
+ if( !$errors ) {
+ $domains = $ldap->domainsForMaintainerDn($dn);
+ $remove_domains = array_diff($domains,$_POST['domains']);
+ $ldap->removeFromDomainGroups( $dn, $remove_domains );
$ldap->addToDomainGroups( $newdn, $_POST['domains'] );
+ }
}
}
}
From cvs at kolab.org Tue Aug 7 13:56:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 7 Aug 2007 13:56:58 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.55,1.56
Message-ID: <20070807115658.6122560C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv24145/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog
Log Message:
kolab/issue1246 (Permission handling in the webadmin frontend)
https://intevation.de/roundup/kolab/issue1246
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- ChangeLog 13 Jul 2007 06:51:28 -0000 1.55
+++ ChangeLog 7 Aug 2007 11:56:56 -0000 1.56
@@ -1,3 +1,10 @@
+2007-08-07 Gunnar Wrobel
+
+ * www/admin/domainmaintainer/domainmaintainer.php.in:
+
+ fixed kolab/issue1246 (Permission handling in the webadmin frontend)
+ https://intevation.de/roundup/kolab/issue1246
+
2007-07-13 Gunnar Wrobel
* php/admin/include/ldap.class.php:
From cvs at kolab.org Tue Aug 7 13:56:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 7 Aug 2007 13:56:58 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.145,1.146
Message-ID: <20070807115658.58BA160AE7B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24145
Modified Files:
release-notes.txt
Log Message:
kolab/issue1246 (Permission handling in the webadmin frontend)
https://intevation.de/roundup/kolab/issue1246
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- release-notes.txt 7 Aug 2007 11:40:14 -0000 1.145
+++ release-notes.txt 7 Aug 2007 11:56:56 -0000 1.146
@@ -21,7 +21,7 @@
FIXME (add CVS changes between 20070608 and 20070726)
- - perl-kolab-5.8.8-2007????
+ - perl-kolab-2.1.99-2007????
Removed the Kolab-Mailer module.
@@ -37,9 +37,6 @@
Converted the package into a standard perl library package.
- FIXME: Is it possible to downgrade this package to
- perl-kolab-2.1.99 (or later perl-kolab-2.2)?
-
- kolabconf-2.1.99-2007????:
New package that holds the kolabconf script.
@@ -70,6 +67,9 @@
Added "with_horde" support.
+ - kolab-webadmin-2.1.99-2007????:
+
+ kolab/issue1246 (Permission handling in the webadmin frontend)
Changes between 2.1.0 and 2.2-beta1:
From cvs at kolab.org Tue Aug 7 14:03:03 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 7 Aug 2007 14:03:03 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.146,1.147
Message-ID: <20070807120303.E344660AE7B@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv24310
Modified Files:
release-notes.txt
Log Message:
fixed kolab/issue1611 ([webadmin] page.tpl use no valid XHTML)
https://intevation.de/roundup/kolab/issue1611
Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- release-notes.txt 7 Aug 2007 11:56:56 -0000 1.146
+++ release-notes.txt 7 Aug 2007 12:03:01 -0000 1.147
@@ -70,6 +70,7 @@
- kolab-webadmin-2.1.99-2007????:
kolab/issue1246 (Permission handling in the webadmin frontend)
+ kolab/issue1611 ([webadmin] page.tpl use no valid XHTML)
Changes between 2.1.0 and 2.2-beta1:
From cvs at kolab.org Tue Aug 7 14:03:03 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 7 Aug 2007 14:03:03 +0200 (CEST)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/templates
page.tpl.in, 1.4, 1.5
Message-ID: <20070807120303.EAF5160C4A1@lists.intevation.de>
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates
In directory doto:/tmp/cvs-serv24310/kolab-webadmin/kolab-webadmin/php/admin/templates
Modified Files:
page.tpl.in
Log Message:
fixed kolab/issue1611 ([webadmin] page.tpl use no valid XHTML)
https://intevation.de/roundup/kolab/issue1611
Index: page.tpl.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/page.tpl.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- page.tpl.in 24 May 2007 10:03:51 -0000 1.4
+++ page.tpl.in 7 Aug 2007 12:03:01 -0000 1.5
@@ -29,7 +29,7 @@
@@ -42,7 +42,7 @@
{section name=id loop=$languages}
{if $languages[id].code==$currentlang}
-{$languages[id].name}
+{$languages[id].name}
{else}
{$languages[id].name}
{/if}
@@ -104,7 +104,5 @@
-->
-
-