32 commits - 1st.README apache/apache.spec imapd/imapd.spec kolab-webadmin/kolab-webadmin Makefile openpkg/Makefile pear/Kolab_Filter pear/Kolab_Freebusy pear/kolab-webadmin perl-kolab/Makefile perl-kolab/perl-kolab perl-kolab/perl-kolab.spec release-notes.txt
Git Service User
git at kolabsys.com
Fri Apr 15 22:05:04 CEST 2011
1st.README | 156 +++
Makefile | 8
apache/apache.spec | 2
imapd/imapd.spec | 2
kolab-webadmin/kolab-webadmin/COPYING | 481 ++++++++++
kolab-webadmin/kolab-webadmin/data/templates/login.tpl | 14
kolab-webadmin/kolab-webadmin/data/templates/page.tpl | 94 -
kolab-webadmin/kolab-webadmin/package.xml | 45
kolab-webadmin/kolab-webadmin/www/admin/custom.css | 183 +++
kolab-webadmin/kolab-webadmin/www/admin/favicon.ico |binary
kolab-webadmin/kolab-webadmin/www/admin/favicon.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/body.jpg |binary
kolab-webadmin/kolab-webadmin/www/admin/images/bottom.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/eye_pencil.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/footer.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/icon_grey_logout.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/identica.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/irc.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/klogo.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/kolab.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/line.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/listitem.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/logo.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/menu.jpg |binary
kolab-webadmin/kolab-webadmin/www/admin/images/root.jpg |binary
kolab-webadmin/kolab-webadmin/www/admin/images/twitter.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/ul-icon.png |binary
kolab-webadmin/kolab-webadmin/www/admin/images/user-icon-1-20x20.gif |binary
kolab-webadmin/kolab-webadmin/www/admin/screen.css | 265 +++++
kolab-webadmin/kolab-webadmin/www/admin/user/user.php | 4
openpkg/Makefile | 2
pear/Kolab_Filter/Kolab_Filter.spec | 1
pear/Kolab_Freebusy/ChangeLog | 6
pear/Kolab_Freebusy/Kolab_FreeBusy.spec | 2
pear/Kolab_Freebusy/package.info | 2
pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.0/Kolab_FreeBusy_0.5.0_p1.patch | 32
pear/kolab-webadmin/kolab-webadmin.spec | 4
pear/kolab-webadmin/package.info | 4
perl-kolab/Makefile | 2
perl-kolab/perl-kolab.spec | 4
perl-kolab/perl-kolab/lib/Kolab.pm | 4
release-notes.txt | 46
42 files changed, 1283 insertions(+), 80 deletions(-)
New commits:
commit 6cd4a12f6e36d61403c0ee53e50158a4c87868a0
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Fri Apr 15 21:24:23 2011 +0200
revert 7b17e2ac and 6330a460 since openpkg didn't like it
diff --git a/openpkg/kolab.patch b/openpkg/kolab.patch
index 14aaa3d..3d6e732 100644
--- a/openpkg/kolab.patch
+++ b/openpkg/kolab.patch
@@ -17,7 +17,7 @@ diff -urN openpkg/openpkg.spec openpkg-kolab/openpkg.spec
# the package version/release
%define V_openpkg 20071227
-+%define V_release 20071227_kolab3
++%define V_release 20071227_kolab2
# the used software versions
%define V_rpm 4.2.1
@@ -39,32 +39,6 @@ diff -urN openpkg/openpkg.spec openpkg-kolab/openpkg.spec
# list of sources
Source0: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
-@@ -1950,6 +1949,25 @@
- echo "## openpkg-${name} -- startup/shutdown transfer script for OpenPKG ${prefix} hierarchy"
- echo "##"
- echo ""
-+ echo "# chkconfig: 99 00"
-+ echo "# description: Kolab is a Groupware Solution for Emails, Appointments,\"
-+ echo "# Contacts and more."
-+ echo "# config: ${prefix}/etc/kolab/kolab.conf"
-+ echo ""
-+ echo "### BEGIN INIT INFO"
-+ echo "# Provides: kolab spamassassin amavisd apache httpd clamav imapd postfix sasl saslauthd openldap MTA"
-+ echo "# Required-Start: $local_fs $network $remote_fs $named"
-+ echo "# Required-Stop: $local_fs $network $remote_fs"
-+ echo "# Should-Start: $syslog"
-+ echo "# Should-Stop: $syslog"
-+ echo "# Default-Start: 2 3 4 5"
-+ echo "# Default-Stop: 0 1 6"
-+ echo "# Short-Description: Startup/Shutdown script for OpenPKG ${prefix} hierarchy"
-+ echo "# Description: Kolab is a Groupware Solution for Emails, Appointments,"
-+ echo "# Contacts and more. This script starts/stops the OpenPKG"
-+ echo "# ${prefix} hierarchy."
-+ echo "### END INIT INFO"
-+ echo ""
- echo "depend() {"
- echo " after *"
- echo "}"
diff -urN openpkg/rpmtool openpkg-kolab/rpmtool
--- openpkg/rpmtool 2007-10-11 22:40:43.000000000 +0200
+++ openpkg-kolab/rpmtool 2009-09-23 15:45:25.946152864 +0200
diff --git a/release-notes.txt b/release-notes.txt
index 5e6edb9..31dc4cb 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -47,12 +47,6 @@ Changes between 2.3-alpha and 2.3.0:
Update to 2.4.23
- - openpkg-20071227-20071227_kolab3
-
- kolab/issue4531 (/etc/init.d/kolab needs LSB headers)
- kolab/issue4693 (Kolab 2.3-alpha install error on Debian squeeze)
- kolab/issue4677 (Kolab server 2.2.4 fails to build on Ubuntu natty)
-
- php-5.3.5-20110301
Update to 5.3.5
commit d6ae6b24dbb1f6cce1bd9fa9d4c854fcfdc64cca
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Fri Apr 15 15:58:58 2011 +0200
kolab-webadmin: kolab/issue1549 (Patch to change dn: cn=... -> dn: mail=...)
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/user/user.php b/kolab-webadmin/kolab-webadmin/www/admin/user/user.php
index 7c00de3..7ba9d27 100644
--- a/kolab-webadmin/kolab-webadmin/www/admin/user/user.php
+++ b/kolab-webadmin/kolab-webadmin/www/admin/user/user.php
@@ -662,7 +662,7 @@ switch( $action ) {
if ($action == "save") {
if (!$errors) {
- if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$domain_dn;
+ if (!empty($ldap_object['uid'])) $newdn = "uid=".$ldap->dn_escape($ldap_object['uid']).",".$domain_dn;
else $newdn = $dn;
if (strcmp($dn,$newdn) != 0) {
// Check for distribution lists with this user as member
@@ -771,7 +771,7 @@ switch( $action ) {
} else {
// firstsave
if (!$errors) {
- $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).$dn_add.",".$domain_dn;
+ $dn = "uid=".$ldap->dn_escape($ldap_object['uid']).$dn_add.",".$domain_dn;
foreach( $ldap_object as $k => $v ) {
if( $v == array() ) unset($ldap_object[$k]);
}
commit ed92e204e0eb1dfaa17fbc6d6fa8783aebe32648
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Fri Apr 15 16:37:28 2011 +0200
release-notes.txt: package will still be named kolab-webadmin-2.3.0-20110414
diff --git a/release-notes.txt b/release-notes.txt
index 7b23b0a..5e6edb9 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -33,7 +33,7 @@ Changes between 2.3-alpha and 2.3.0:
Fix missing "require" statements
- - kolab-webadmin-2.3.0-20110415
+ - kolab-webadmin-2.3.0-20110414
New style sheet with Kolab Systems logo.
commit 2827ad31a4ea6fdbe74a18a4a4f3d28ff4fa570c
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Fri Apr 15 16:32:15 2011 +0200
DN patch will be included in 2.3.0
- revert 975e605723d0b569ef3342c996d9b79faa97b259
- update release notes
diff --git a/1st.README b/1st.README
index 182f01f..69cabee 100644
--- a/1st.README
+++ b/1st.README
@@ -203,17 +203,43 @@ otherwise your setup might seem to work fine, but will not work reliably!
file that contains "SYNTAX 1.3.6.1.4.1.1466.115.121.1.11" or use the
backup of both files you created in step 0.
-8. Before starting the LDAP server the database must be restored from
+8. In previous versions of the Kolab Server, the Distinguished Name (dn)
+ of users was built from their common name (cn) attribute and the cn
+ was built from the attributes 'givenName' (e.g. John) and 'sn' (Doe).
+ Therefore it was not possible to have two users of the same name or
+ two accounts for the same person (cn=John Doe) since each dn must be
+ distinct.
+
+ Kolab 2.3 uses the 'uid' attribute to build the dn. This change is
+ backwards compatible. Existing users will continue to use the old dn
+ while new users will be created following the new scheme. This means
+ that you can create an account with the same cn after the upgrade.
+
+ To take however full advantage of the new scheme, you need to convert
+ your LDAP with the script 'kolab-cn2uid' which you can download from
+ http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/utils/admin/kolab-cn2uid
+ (https:// can be used to provide a secure download, if you import
+ the corresponding root certificate from https://ssl.intevation.de/)
+
+ If you want to convert your existing LDAP, please run the following
+ commands as root:
+
+ # mv ~/kolab-update.ldif ~/kolab-dn-cn.ldif || \
+ cp ~/kolab-2.2.4.ldif ~/kolab-dn-cn.ldif
+ # (umask 077 && /kolab/bin/php \
+ kolab-cn2uid -i ~/kolab-dn-cn.ldif -o ~/kolab-update.ldif)
+
+9. Before starting the LDAP server the database must be restored from
the ldif:
# rm /kolab/var/openldap/openldap-data/*
# /kolab/sbin/slapadd -l ~/kolab-update.ldif
-9. Manually transfer local changes of templates from .rpmsave into the
+10. Manually transfer local changes of templates from .rpmsave into the
new templates and remove all .rpmsave files below /kolab/etc as
discussed in the "General update instructions" above.
-10. Start the OpenLDAP, generate the configuration files and start the
+11. Start the OpenLDAP, generate the configuration files and start the
Kolab server:
# /kolab/bin/openpkg rc openldap start
diff --git a/release-notes.txt b/release-notes.txt
index 1b5dc9a..7b23b0a 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -33,6 +33,12 @@ Changes between 2.3-alpha and 2.3.0:
Fix missing "require" statements
+ - kolab-webadmin-2.3.0-20110415
+
+ New style sheet with Kolab Systems logo.
+
+ kolab/issue1549 (Patch to change dn: cn=... -> dn: uid=...)
+
- kolab-z-push-0.7.3-2
Reduce package's "Requires:" to what is actually needed
commit 2abfe208b4f45410a42393dd0c207e2a9c4a844b
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Fri Apr 15 16:13:55 2011 +0200
1st.README: 2.3.0 still uses cn instead of uid for dn, remove upgrade docs
kolab/issue1549 (Patch to change dn: cn=... -> dn: mail=...) and release-notes
do not mention that this was included and the code still uses cn.
diff --git a/1st.README b/1st.README
index 69cabee..182f01f 100644
--- a/1st.README
+++ b/1st.README
@@ -203,43 +203,17 @@ otherwise your setup might seem to work fine, but will not work reliably!
file that contains "SYNTAX 1.3.6.1.4.1.1466.115.121.1.11" or use the
backup of both files you created in step 0.
-8. In previous versions of the Kolab Server, the Distinguished Name (dn)
- of users was built from their common name (cn) attribute and the cn
- was built from the attributes 'givenName' (e.g. John) and 'sn' (Doe).
- Therefore it was not possible to have two users of the same name or
- two accounts for the same person (cn=John Doe) since each dn must be
- distinct.
-
- Kolab 2.3 uses the 'uid' attribute to build the dn. This change is
- backwards compatible. Existing users will continue to use the old dn
- while new users will be created following the new scheme. This means
- that you can create an account with the same cn after the upgrade.
-
- To take however full advantage of the new scheme, you need to convert
- your LDAP with the script 'kolab-cn2uid' which you can download from
- http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/utils/admin/kolab-cn2uid
- (https:// can be used to provide a secure download, if you import
- the corresponding root certificate from https://ssl.intevation.de/)
-
- If you want to convert your existing LDAP, please run the following
- commands as root:
-
- # mv ~/kolab-update.ldif ~/kolab-dn-cn.ldif || \
- cp ~/kolab-2.2.4.ldif ~/kolab-dn-cn.ldif
- # (umask 077 && /kolab/bin/php \
- kolab-cn2uid -i ~/kolab-dn-cn.ldif -o ~/kolab-update.ldif)
-
-9. Before starting the LDAP server the database must be restored from
+8. Before starting the LDAP server the database must be restored from
the ldif:
# rm /kolab/var/openldap/openldap-data/*
# /kolab/sbin/slapadd -l ~/kolab-update.ldif
-10. Manually transfer local changes of templates from .rpmsave into the
+9. Manually transfer local changes of templates from .rpmsave into the
new templates and remove all .rpmsave files below /kolab/etc as
discussed in the "General update instructions" above.
-11. Start the OpenLDAP, generate the configuration files and start the
+10. Start the OpenLDAP, generate the configuration files and start the
Kolab server:
# /kolab/bin/openpkg rc openldap start
commit c82714e97ea557b6af17c1fe65a9520366fd3ce9
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Fri Apr 15 15:35:57 2011 +0200
kolab-webadmin: update package.xml for Bogo's new skin
diff --git a/kolab-webadmin/kolab-webadmin/package.xml b/kolab-webadmin/kolab-webadmin/package.xml
index 51dfaa6..6f1bdad 100644
--- a/kolab-webadmin/kolab-webadmin/package.xml
+++ b/kolab-webadmin/kolab-webadmin/package.xml
@@ -154,6 +154,25 @@
<file name="domainmaintainer.php" role="www" />
<file name="index.php" role="www" />
</dir> <!-- /www/admin/domainmaintainer -->
+ <dir name="images">
+ <file name="body.jpg" role="www" />
+ <file name="bottom.png" role="www" />
+ <file name="eye_pencil.png" role="www" />
+ <file name="footer.png" role="www" />
+ <file name="icon_grey_logout.png" role="www" />
+ <file name="identica.png" role="www" />
+ <file name="irc.png" role="www" />
+ <file name="klogo.png" role="www" />
+ <file name="kolab.png" role="www" />
+ <file name="line.png" role="www" />
+ <file name="listitem.png" role="www" />
+ <file name="logo.png" role="www" />
+ <file name="menu.jpg" role="www" />
+ <file name="root.jpg" role="www" />
+ <file name="twitter.png" role="www" />
+ <file name="ul-icon.png" role="www" />
+ <file name="user-icon-1-20x20.gif" role="www" />
+ </dir> <!-- /www/admin/images -->
<dir name="kolab">
<file name="codefusion.php" role="www" />
<file name="erfrakon.php" role="www" />
@@ -189,9 +208,13 @@
<file name="user.php" role="www" />
<file name="vacation.php" role="www" />
</dir> <!-- /www/admin/user -->
+ <file name="custom.css" role="www" />
+ <file name="favicon.ico" role="www" />
+ <file name="favicon.png" role="www" />
<file name="index.php" role="www" />
<file name="logout.php" role="www" />
<file name="print.css" role="www" />
+ <file name="screen.css" role="www" />
<file name="style.css" role="www" />
</dir> <!-- /www/admin -->
<file name="favicon.ico" role="www" />
@@ -284,9 +307,13 @@
<install as="KolabAdmin/Unit/Sieve/Segment/VacationTest.php" name="test/KolabAdmin/Unit/Sieve/Segment/VacationTest.php" />
<install as="favicon.ico" name="www/favicon.ico" />
<install as="favicon.png" name="www/favicon.png" />
+ <install as="admin/custom.css" name="www/admin/custom.css" />
+ <install as="admin/favicon.ico" name="www/admin/favicon.ico" />
+ <install as="admin/favicon.png" name="www/admin/favicon.png" />
<install as="admin/index.php" name="www/admin/index.php" />
<install as="admin/logout.php" name="www/admin/logout.php" />
<install as="admin/print.css" name="www/admin/print.css" />
+ <install as="admin/screen.css" name="www/admin/screen.css" />
<install as="admin/style.css" name="www/admin/style.css" />
<install as="admin/addressbook/addr.php" name="www/admin/addressbook/addr.php" />
<install as="admin/addressbook/index.php" name="www/admin/addressbook/index.php" />
@@ -296,6 +323,23 @@
<install as="admin/distributionlist/list.php" name="www/admin/distributionlist/list.php" />
<install as="admin/domainmaintainer/domainmaintainer.php" name="www/admin/domainmaintainer/domainmaintainer.php" />
<install as="admin/domainmaintainer/index.php" name="www/admin/domainmaintainer/index.php" />
+ <install as="admin/images/body.jpg" name="www/admin/images/body.jpg" />
+ <install as="admin/images/bottom.png" name="www/admin/images/bottom.png" />
+ <install as="admin/images/eye_pencil.png" name="www/admin/images/eye_pencil.png" />
+ <install as="admin/images/footer.png" name="www/admin/images/footer.png" />
+ <install as="admin/images/icon_grey_logout.png" name="www/admin/images/icon_grey_logout.png" />
+ <install as="admin/images/identica.png" name="www/admin/images/identica.png" />
+ <install as="admin/images/irc.png" name="www/admin/images/irc.png" />
+ <install as="admin/images/klogo.png" name="www/admin/images/klogo.png" />
+ <install as="admin/images/kolab.png" name="www/admin/images/kolab.png" />
+ <install as="admin/images/line.png" name="www/admin/images/line.png" />
+ <install as="admin/images/listitem.png" name="www/admin/images/listitem.png" />
+ <install as="admin/images/logo.png" name="www/admin/images/logo.png" />
+ <install as="admin/images/menu.jpg" name="www/admin/images/menu.jpg" />
+ <install as="admin/images/root.jpg" name="www/admin/images/root.jpg" />
+ <install as="admin/images/twitter.png" name="www/admin/images/twitter.png" />
+ <install as="admin/images/ul-icon.png" name="www/admin/images/ul-icon.png" />
+ <install as="admin/images/user-icon-1-20x20.gif" name="www/admin/images/user-icon-1-20x20.gif" />
<install as="admin/kolab/codefusion.php" name="www/admin/kolab/codefusion.php" />
<install as="admin/kolab/erfrakon.php" name="www/admin/kolab/erfrakon.php" />
<install as="admin/kolab/index.php" name="www/admin/kolab/index.php" />
commit 0ccbd6e7de18a574efee5b96c606490b3b2e2be3
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Fri Apr 15 15:11:01 2011 +0200
1st.README: awk needs an input file to do useful work
diff --git a/1st.README b/1st.README
index d92d342..69cabee 100644
--- a/1st.README
+++ b/1st.README
@@ -180,7 +180,7 @@ otherwise your setup might seem to work fine, but will not work reliably!
recommended way) or adjust the core schema. To see a list of values
used in the countryName attribute (see above) run:
- # awk '/^c:/ {print $2}' | sort -u
+ # awk '/^c:/ {print $2}' ~/kolab-2.2.4.ldif | sort -u
Because of the unlimited number of possible values we cannot provide
an upgrade script to replace the entries, but here is an example for
commit a5d4c081bd0fe30c9789098b9aea06a5b5b04c3f
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Fri Apr 15 15:07:40 2011 +0200
1st.README: Add hint about tclsh when building from .src.rpm
diff --git a/1st.README b/1st.README
index f23365d..d92d342 100644
--- a/1st.README
+++ b/1st.README
@@ -586,6 +586,11 @@ Known problems and workarounds
available in kolab/issue4531 and will be included in a future server
release.
+ - When building from .src.rpm files, tclsh must be available on the
+ host system. On Debian GNU/Linux the package proviting tclsh is
+ called tcl8.4 (lenny) or tcl8.5 (squeeze). See kolab/issue4695 for
+ further details.
+
- Your system (C library) has to support all languages you want to
have available in the web admin interface, the web client and
fbview. For most languages you have to use the non-UTF-8 and
commit 7c3b633073fb0856690bdc6c5eb085363c1cc126
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Fri Apr 15 11:08:42 2011 +0200
1st.README: Repair and simplify cn2uid conversion
diff --git a/1st.README b/1st.README
index 86d6230..f23365d 100644
--- a/1st.README
+++ b/1st.README
@@ -224,19 +224,16 @@ otherwise your setup might seem to work fine, but will not work reliably!
If you want to convert your existing LDAP, please run the following
commands as root:
- # if [ -f ~/kolab-new.ldif ]; then
- mv ~/kolab-new.ldif ~/kolab-dn-cn.ldif
- else
- cp ~/kolab-2.2.4.ldif ~/kolab-dn-cn.ldif
- fi
+ # mv ~/kolab-update.ldif ~/kolab-dn-cn.ldif || \
+ cp ~/kolab-2.2.4.ldif ~/kolab-dn-cn.ldif
# (umask 077 && /kolab/bin/php \
- kolab-cn2uid -i ~/kolab-dn-cn.ldif -o ~/kolab-new.ldif)
+ kolab-cn2uid -i ~/kolab-dn-cn.ldif -o ~/kolab-update.ldif)
9. Before starting the LDAP server the database must be restored from
the ldif:
# rm /kolab/var/openldap/openldap-data/*
- # /kolab/sbin/slapadd -l ~/kolab-new.ldif
+ # /kolab/sbin/slapadd -l ~/kolab-update.ldif
10. Manually transfer local changes of templates from .rpmsave into the
new templates and remove all .rpmsave files below /kolab/etc as
commit 6633f78ab6ab808449445077b85b408a21f04215
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Fri Apr 15 10:48:04 2011 +0200
1st.README: further details for init script workaround
diff --git a/1st.README b/1st.README
index e91c921..86d6230 100644
--- a/1st.README
+++ b/1st.README
@@ -582,6 +582,13 @@ Known problems and workarounds
/kolab/bin/openpkg rc all start
+ Be careful when shutting down your computer, use "stop" instead of
+ "start" with above command to manually stop the Kolab Server first.
+
+ An updated init script which will provide a real solution will be
+ available in kolab/issue4531 and will be included in a future server
+ release.
+
- Your system (C library) has to support all languages you want to
have available in the web admin interface, the web client and
fbview. For most languages you have to use the non-UTF-8 and
commit cfe747dfad8dbb8cf3a0263cdecbb83d079886cd
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Fri Apr 15 10:25:08 2011 +0200
1st.README: Document workaround for insserv choking on kolab init script
diff --git a/1st.README b/1st.README
index 424e2cb..e91c921 100644
--- a/1st.README
+++ b/1st.README
@@ -568,6 +568,20 @@ disk space or restore it after new installations to save some time.
Known problems and workarounds
------------------------------
+ - Debian GNU/Linux 6.0 (squeeze) and other modern Linux distributions
+ require certain LSB headers in init scripts, which are not yet
+ provided by the openpkg package used in this Kolab Server release.
+
+ A quick workaround is to simply remove it:
+
+ rm /etc/init.d/kolab /etc/rc?.d/???kolab
+
+ To start the Kolab Server you can use the following command, which
+ can be added to /etc/rc.local on Debian squeeze or a similar start
+ script used by your distribution:
+
+ /kolab/bin/openpkg rc all start
+
- Your system (C library) has to support all languages you want to
have available in the web admin interface, the web client and
fbview. For most languages you have to use the non-UTF-8 and
commit c3edd0b9a3ce949f3e4326dd9499d4c5cd0ad6dc
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Fri Apr 15 10:09:18 2011 +0200
release-notes and README: 2.3.0, current date
diff --git a/1st.README b/1st.README
index 1412589..424e2cb 100644
--- a/1st.README
+++ b/1st.README
@@ -1,6 +1,6 @@
Kolab Server 2.3 Install and Upgrade Information
================================================
-(Version 20110414, Kolab Server 2.3.0)
+(Version 20110415, Kolab Server 2.3.0)
See http://kolab.org/ for general information about Kolab,
or look at http://wiki.kolab.org/ for specific topics.
diff --git a/release-notes.txt b/release-notes.txt
index c57190d..1b5dc9a 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -1,6 +1,6 @@
Kolab Server 2.3 Release Notes
==============================
-(Version 20101214, Kolab Server 2.3-alpha)
+(Version 20110415, Kolab Server 2.3.0)
For upgrading and installation instructions, please refer to
the 1st.README file in the package directory.
commit 097877d77431caec6f233d45abe8d8846bd0d89b
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Fri Apr 15 03:25:48 2011 +0200
kolab-webadmin: Update and fix Source URL for release
diff --git a/pear/kolab-webadmin/kolab-webadmin.spec b/pear/kolab-webadmin/kolab-webadmin.spec
index 1c2e486..6ab23f5 100644
--- a/pear/kolab-webadmin/kolab-webadmin.spec
+++ b/pear/kolab-webadmin/kolab-webadmin.spec
@@ -7,8 +7,8 @@
%define V_repo_commit
%define V_repo_release
%define V_version 2.3.0
-%define V_release 20100914
-%define V_sourceurl http://files.kolab.org/incoming/wrobel
+%define V_release 20110414
+%define V_sourceurl http://files.kolab.org/server/development-2.3/sources
%define V_php_lib_loc php
%define V_summary A frontend for the Kolab user database.
%define V_license LGPL
diff --git a/pear/kolab-webadmin/package.info b/pear/kolab-webadmin/package.info
index feb8d27..ec5cb4c 100644
--- a/pear/kolab-webadmin/package.info
+++ b/pear/kolab-webadmin/package.info
@@ -16,10 +16,10 @@ package_origin='WGET'
version='2.3.0'
# Package release number
-release='20100914'
+release='20110414'
# Source URL to download from
-sourceurl='http://files.kolab.org/incoming/wrobel'
+sourceurl='http://files.kolab.org/server/development-2.3/sources'
# In which PHP library location should the library get installed
php_lib_loc='php'
commit 5f81192c9b4312e25d27f0abdbabc8ed6ba9e5ce
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Fri Apr 15 00:52:34 2011 +0200
release-notes.txt: Update for kolab-z-push-0.7.3-2
diff --git a/release-notes.txt b/release-notes.txt
index 7b53a11..c57190d 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -33,6 +33,10 @@ Changes between 2.3-alpha and 2.3.0:
Fix missing "require" statements
+ - kolab-z-push-0.7.3-2
+
+ Reduce package's "Requires:" to what is actually needed
+
- openldap-2.4.23-20110308
Update to 2.4.23
commit 8d71eeef1cc9d536d484c5f5d785bc2b5774c241
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Thu Apr 14 23:55:03 2011 +0200
kolab-webadmin: Add missing COPYING, remove missing INSTALL file from package.xml
diff --git a/kolab-webadmin/kolab-webadmin/COPYING b/kolab-webadmin/kolab-webadmin/COPYING
new file mode 100644
index 0000000..eb685a5
--- /dev/null
+++ b/kolab-webadmin/kolab-webadmin/COPYING
@@ -0,0 +1,481 @@
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it. You can use it for
+your libraries, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library. If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software. To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+ Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs. This
+license, the GNU Library General Public License, applies to certain
+designated libraries. This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+ The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it. Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program. However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+ Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries. We
+concluded that weaker conditions might promote sharing better.
+
+ However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves. This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them. (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.) The hope is that this
+will lead to faster development of free libraries.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+ Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License"). Each licensee is
+addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ c) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ d) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ Appendix: How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/kolab-webadmin/kolab-webadmin/package.xml b/kolab-webadmin/kolab-webadmin/package.xml
index ed951f4..51dfaa6 100644
--- a/kolab-webadmin/kolab-webadmin/package.xml
+++ b/kolab-webadmin/kolab-webadmin/package.xml
@@ -200,7 +200,6 @@
<file name="AUTHORS" role="data" />
<file name="ChangeLog" role="data" />
<file name="COPYING" role="data" />
- <file name="INSTALL" role="data" />
<file name="NEWS" role="data" />
</dir> <!-- / -->
</contents>
commit 38a5592ea922b09202ab542f43e7a58c06dda7ca
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Thu Apr 14 23:45:21 2011 +0200
kolab-webadmin: Apply new skin from Bogo
diff --git a/kolab-webadmin/kolab-webadmin/data/templates/login.tpl b/kolab-webadmin/kolab-webadmin/data/templates/login.tpl
index 3c36775..6c56dcf 100755
--- a/kolab-webadmin/kolab-webadmin/data/templates/login.tpl
+++ b/kolab-webadmin/kolab-webadmin/data/templates/login.tpl
@@ -5,18 +5,22 @@
End:
*}
<h1>{tr msg="Enter UID and password to login"}</h1>
-<div class="contentform">
+
+
+<div class="contentform_login" style="width:40%;text-align:center;">
<form method="post">
<table>
<tr>
- <td><label for="username">{tr msg="Username:"}</label></td><td><input type="text" name="username" id="username"/></td>
+ <td><label for="username">{tr msg="Username:"}</label></td><td><input type="text" name="username" id="username" style="background:#f0f0f0;margin:5px;padding:4px;"/></td>
</tr>
+
<tr>
- <td><label for="password">{tr msg="Password:"}</label></td><td><input type="password" name="password" id="password"/></td>
+ <td colspan="2" align="right" width="1px"></td>
</tr>
-<tr>
- <td colspan="2" align="right"><input type="submit" name="login" value="{tr msg="Login"}"/></td>
+<tr style="background:#fefefe">
+ <td><label for="password">{tr msg="Password:"}</label></td><td><input type="password" name="password" id="password" style="background:#f0f0f0;margin:5px;padding:4px;"/> <input type="submit" name="login" value="{tr msg="Login"}"/></td>
</tr>
+
</table>
</form>
</div>
diff --git a/kolab-webadmin/kolab-webadmin/data/templates/page.tpl b/kolab-webadmin/kolab-webadmin/data/templates/page.tpl
index 4b71979..f87bf94 100755
--- a/kolab-webadmin/kolab-webadmin/data/templates/page.tpl
+++ b/kolab-webadmin/kolab-webadmin/data/templates/page.tpl
@@ -4,19 +4,17 @@
buffer-file-coding-system: utf-8
End:
*}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE HTML>
+<html lang="en-US">
<head>
-<title>{$page_title}</title>
+<meta charset="UTF-8">
+<title>Kolab: {$page_title}</title>
<link rel="shortcut icon" type="image/png" href="{$webserver_web_prefix}/favicon.png" />
<meta name="robots" content="noindex" />
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Content-Language" content="{$currentlang}" />
<meta name="description" content="Kolab Administration Webinterface" />
<meta name="keywords" content="Linux, Unix, Groupware, Email, Calendar" />
-<link rel="stylesheet" type="text/css" href="{$stylesheet|default:"$topdir/style.css"}" />
-<link rel="stylesheet" type="text/css" media="print" href="{"$topdir/print.css"}" />
+<link rel="stylesheet" type="text/css" href="{$stylesheet|default:"$topdir/screen.css"}" />
+<link rel="stylesheet" type="text/css" href="{"$topdir/custom.css"}" />
<script type="text/javascript">
<!--
@@ -29,18 +27,15 @@ function changeLanguage(combobox) {ldelim}
</head>
<body>
-<div id="topbar">
- <a href="{$kolab_wui}"><span id="toplogo"></span></a>
- <div id="toptitle">{$page_title}</div>
-</div>
-<div id="topuserinfo">
+<div id="header" class="container">
+<div class="span-24">
+<h3><a href="{$kolab_wui}"><img src="/admin/images/klogo.png" style="vertical-align:middle;" alt="logo"></a></h3>
+<div id="menu-top">
{if $uid}
-{tr msg="User:"} {$uid} | {tr msg="Role:"} {$group} | <a id="logout" href="{$topdir}/logout.php">{tr msg="Logout"}</a>
-{else}
-{tr msg="Not logged in"}
+<img src="/admin/images/user-icon-1-20x20.gif" width="16" style="vertical-align:middle;" title="Username" alt="username icon"> {$uid} <img src="/admin/images/eye_pencil.png" width="16" style="vertical-align:middle;margin-left:8px;" title="Role" alt="Role icon"> {$group}
{/if}
-<br/>
-<select name="lang" class="langcombo" onchange="changeLanguage(this);">
+
+<img src="/admin/images/ul-icon.png" width="16" style="vertical-align:middle;margin-left:8px;" title="Change Language" alt="Language icon"> <select name="lang" style="height:17px;vertical-align:middle" onchange="changeLanguage(this);">
{section name=id loop=$languages}
{if $languages[id].code==$currentlang}
<option value="{$languages[id].code}" selected="selected">{$languages[id].name}</option>
@@ -49,28 +44,43 @@ function changeLanguage(combobox) {ldelim}
{/if}
{/section}
</select>
+{if $uid}
+<a id="logout" href="{$topdir}/logout.php"><img src="/admin/images/icon_grey_logout.png" width="16" style="vertical-align:middle;margin-left:90px;" title="Logout" alt="Logout icon"></a>
+{/if}
</div>
-{strip}
-<div id="topmenu">
-{foreach from=$menuitems item=menuitem}
-<a href="{$menuitem.url}">
- <span class="topmenuitem{$menuitem.selected}"> {$menuitem.name} </span>
-</a>
+ </div><!-- .span-24 -->
+ </div><!-- #header -->
+ <div id="root">
+ <div class="container">
+ <div>
+ <ul id="navlist">
+
+ {foreach from=$menuitems item=menuitem}
+ <li>
+ <a class="{$menuitem.selected}" href="{$menuitem.url}">{$menuitem.name}</a>
+ </li>
{/foreach}
-</div>
-{/strip}
-{if count($submenuitems) > 0}
+
+ </ul>
+ </div><!-- .span-24 -->
+
+
+ <div id="content">
+
<div id="submenu">
+{if count($submenuitems) > 0}
+{$page_title}:
{strip}
{section name=id loop=$submenuitems}
<a href="{$submenuitems[id].url}">
- <span class="submenuitem{$submenuitems[id].selected}">{$submenuitems[id].name}</span>
+{$submenuitems[id].name}
</a> |
{/section}
{/strip}
-</div>
{/if}
-<div id="page">
+</div>
+
+<!--start-->
{if $errors}
<div id="errorcontent">
<div id="errorheader">{tr msg="Errors:"}</div>
@@ -87,23 +97,15 @@ function changeLanguage(combobox) {ldelim}
{/section}
</div>
{/if}
-<div id="maincontent">
+
+<!--end-->
+<div id="allhere">
{include file=$maincontent}
</div>
-<!--
-<div id="validators">
-<a href="http://validator.w3.org/check/referer">
-<img style="border:0;width:88px;height:31px"
- src="http://www.w3.org/Icons/valid-xhtml10"
- alt="Valid XHTML 1.0!" />
-</a>
-<a href="http://jigsaw.w3.org/css-validator/check/referer">
-<img style="border:0;width:88px;height:31px"
- src="http://jigsaw.w3.org/css-validator/images/vcss"
- alt="Valid CSS!" />
-</a>
-</div>
--->
-</div>
+ </div>
+ </div><!-- .container -->
+ </div><!-- #root -->
+<div id="footer">
+This is the Community Edition of the <b>Kolab Server</b>. It comes with absolutely <b>no warranties</b> and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>. Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.
</body>
</html>
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/custom.css b/kolab-webadmin/kolab-webadmin/www/admin/custom.css
new file mode 100644
index 0000000..c529cca
--- /dev/null
+++ b/kolab-webadmin/kolab-webadmin/www/admin/custom.css
@@ -0,0 +1,183 @@
+html {background: #e7e7e7;}
+body {background: #ffffff url(/admin/images/body.jpg) repeat-x top left; width:100%;}
+
+.span-24{display: block;float:none;}
+
+#header {
+ margin-top: 5px;
+ height: 80px;
+}
+
+
+ #header .span-24 {padding-left: 22px;}
+
+ #header h3{
+ height: 54px;
+ top: 17px;
+ position:relative;
+ }
+
+
+
+ #header ul li {
+ list-style-type: none;
+ list-style-image: url(/admin/images/listitem.png);
+ }
+
+#root {
+ background: #e7e7e7 url(/admin/images/root.jpg) repeat-x top left;
+ min-height: 150px;
+
+}
+
+ #root .container {background: transparent url(/admin/images/bottom.png) no-repeat bottom left;}
+
+ #root #main {
+ background: transparent url(/admin/images/bottom_all.png) no-repeat bottom left;
+ margin-bottom: 10px;
+ padding-bottom: 5px;
+ }
+ #navlist{
+ width:100%;
+
+ }
+
+#navlist li {
+ float:left;
+ line-height: 55px;
+ margin-left: 15px;
+ margin-right: 2px;
+ list-style: none;
+ margin-top: 1px;
+
+}
+
+
+ #navlist li a {
+ color: #5d5656;
+ text-decoration: none;
+ text-align: center;
+ display: block;
+ font-weight:normal;
+ font-size:14px;
+ }
+
+ #navlist li a.selected {font-weight:bold;color: #c6ced8;}
+
+#content {
+ color: #626262;
+ padding-top: 8em;
+ padding-bottom: 24px;
+ margin-bottom: 20px;
+}
+
+ #content h2, #content h2 a, #content h1 {color: #5c5c5c; font-weight: normal;text-shadow: 0 2px 2px #FFFFFF; }
+ #content p:first-letter { font-size: 1.3em; }
+
+#footer {
+
+ padding: 6px;
+text-align: center;
+}
+
+/* Overriding some global properties */
+a:link, a:visited { font-weight: normal; }
+
+
+ #submenu
+ {
+ margin-top:-42px;
+ margin-left: 47px;
+ float:left;
+
+
+ padding:5px;
+
+
+ }
+
+#submenu a {
+ color: #5d5656;
+ text-decoration: underline;
+ text-align: left;
+ padding:7px;
+
+
+ }
+
+#menu-top{
+
+ float:right;
+ position:absolute;
+ top: 16px;
+ right: 12px;
+
+
+}
+
+
+#errorcontent
+{
+ background:#ffffff;
+ width:90%;
+ display:block;
+ padding: 0.2em;
+ margin: 1em;
+ text-align: left;
+ border: 1px dashed;
+
+}
+
+#errorheader
+{
+background:#cf5659;
+font-size:17px;
+color:#ffffff;
+}
+
+
+#messagecontent
+{
+ background:#ffffff;
+ width:90%;
+ display:block;
+ padding: 0.2em;
+ margin: 1em;
+ text-align: left;
+ border: 1px dashed;
+
+}
+
+#messageheader
+{
+background:#a8cc76;
+font-size:17px;
+color:#ffffff;
+}
+
+#allhere
+{
+background:#ffffff;
+margin:2px;
+padding:9px;
+border-radius: 15px;
+-moz-border-radius:10px;
+-webkit-border-radius:10px;
+}
+
+.align_center {
+ text-align: center;
+}
+
+.contentform {
+ /*float: left;*/
+ padding: .1em .5em .1em .5em;
+ background-color: #c6ced8;
+ border: solid 0.2px black;
+}
+
+.contentrow {
+border: 1px dashed;
+background-color: #c6ced8;
+
+}
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/favicon.ico b/kolab-webadmin/kolab-webadmin/www/admin/favicon.ico
new file mode 100644
index 0000000..2c200be
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/favicon.ico differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/favicon.png b/kolab-webadmin/kolab-webadmin/www/admin/favicon.png
new file mode 100644
index 0000000..d8e35a9
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/favicon.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/body.jpg b/kolab-webadmin/kolab-webadmin/www/admin/images/body.jpg
new file mode 100644
index 0000000..1b36d8f
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/body.jpg differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/bottom.png b/kolab-webadmin/kolab-webadmin/www/admin/images/bottom.png
new file mode 100644
index 0000000..4e74138
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/bottom.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/eye_pencil.png b/kolab-webadmin/kolab-webadmin/www/admin/images/eye_pencil.png
new file mode 100644
index 0000000..53562db
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/eye_pencil.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/footer.png b/kolab-webadmin/kolab-webadmin/www/admin/images/footer.png
new file mode 100644
index 0000000..c59c9c0
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/footer.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/icon_grey_logout.png b/kolab-webadmin/kolab-webadmin/www/admin/images/icon_grey_logout.png
new file mode 100644
index 0000000..f70c017
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/icon_grey_logout.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/identica.png b/kolab-webadmin/kolab-webadmin/www/admin/images/identica.png
new file mode 100644
index 0000000..0b593dd
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/identica.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/irc.png b/kolab-webadmin/kolab-webadmin/www/admin/images/irc.png
new file mode 100644
index 0000000..0353e7d
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/irc.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/klogo.png b/kolab-webadmin/kolab-webadmin/www/admin/images/klogo.png
new file mode 100644
index 0000000..dad734b
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/klogo.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/kolab.png b/kolab-webadmin/kolab-webadmin/www/admin/images/kolab.png
new file mode 100644
index 0000000..b2d1e72
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/kolab.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/line.png b/kolab-webadmin/kolab-webadmin/www/admin/images/line.png
new file mode 100644
index 0000000..7a702a8
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/line.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/listitem.png b/kolab-webadmin/kolab-webadmin/www/admin/images/listitem.png
new file mode 100644
index 0000000..766adbb
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/listitem.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/logo.png b/kolab-webadmin/kolab-webadmin/www/admin/images/logo.png
new file mode 100644
index 0000000..3d90965
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/logo.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/menu.jpg b/kolab-webadmin/kolab-webadmin/www/admin/images/menu.jpg
new file mode 100644
index 0000000..bef56ff
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/menu.jpg differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/root.jpg b/kolab-webadmin/kolab-webadmin/www/admin/images/root.jpg
new file mode 100644
index 0000000..64623ad
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/root.jpg differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/twitter.png b/kolab-webadmin/kolab-webadmin/www/admin/images/twitter.png
new file mode 100644
index 0000000..714857f
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/twitter.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/ul-icon.png b/kolab-webadmin/kolab-webadmin/www/admin/images/ul-icon.png
new file mode 100644
index 0000000..9acd221
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/ul-icon.png differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/images/user-icon-1-20x20.gif b/kolab-webadmin/kolab-webadmin/www/admin/images/user-icon-1-20x20.gif
new file mode 100644
index 0000000..941020a
Binary files /dev/null and b/kolab-webadmin/kolab-webadmin/www/admin/images/user-icon-1-20x20.gif differ
diff --git a/kolab-webadmin/kolab-webadmin/www/admin/screen.css b/kolab-webadmin/kolab-webadmin/www/admin/screen.css
new file mode 100644
index 0000000..5221c67
--- /dev/null
+++ b/kolab-webadmin/kolab-webadmin/www/admin/screen.css
@@ -0,0 +1,265 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 1.0
+ http://blueprintcss.org
+
+ * Copyright (c) 2007-Present. See LICENSE for more info.
+ * See README for instructions on how to use Blueprint.
+ * For credits and origins, see AUTHORS.
+ * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* reset.css */
+html {margin:0;padding:0;border:0;}
+body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
+article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;}
+body {line-height:1.5;background:white;}
+table {border-collapse:separate;border-spacing:0;}
+caption, th, td {text-align:left;font-weight:normal;float:none !important;}
+table, th, td {vertical-align:middle;}
+blockquote:before, blockquote:after, q:before, q:after {content:'';}
+blockquote, q {quotes:"" "";}
+a img {border:none;}
+:focus {outline:0;}
+
+/* typography.css */
+html {font-size:100.01%;}
+body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;}
+h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;}
+h1 {font-size:3em;line-height:1;margin-bottom:0.5em;}
+h2 {font-size:2em;margin-bottom:0.75em;}
+h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
+h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
+h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
+h6 {font-size:1em;font-weight:bold;}
+h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
+p {margin:0 0 1.5em;}
+.left {float:left !important;}
+p .left {margin:1.5em 1.5em 1.5em 0;padding:0;}
+.right {float:right !important;}
+p .right {margin:1.5em 0 1.5em 1.5em;padding:0;}
+a:focus, a:hover {color:#09f;}
+a {color:#06c;text-decoration:underline;}
+blockquote {margin:1.5em;color:#666;font-style:italic;}
+strong, dfn {font-weight:bold;}
+em, dfn {font-style:italic;}
+sup, sub {line-height:0;}
+abbr, acronym {border-bottom:1px dotted #666;}
+address {margin:0 0 1.5em;font-style:italic;}
+del {color:#666;}
+pre {margin:1.5em 0;white-space:pre;}
+pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;}
+li ul, li ol {margin:0;}
+ul, ol {margin:0 1.5em 1.5em 0;padding-left:1.5em;}
+ul {list-style-type:disc;}
+ol {list-style-type:decimal;}
+dl {margin:0 0 1.5em 0;}
+dl dt {font-weight:bold;}
+dd {margin-left:1.5em;}
+table {margin-bottom:1.4em;width:100%;}
+th {font-weight:bold;}
+thead th {background:#c3d9ff;}
+th, td, caption {padding:4px 10px 4px 5px;}
+tbody tr:nth-child(even) td, tbody tr.even td {background:#e5ecf9;}
+tfoot {font-style:italic;}
+caption {background:#eee;}
+.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
+.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
+.hide {display:none;}
+.quiet {color:#666;}
+.loud {color:#000;}
+.highlight {background:#ff0;}
+.added {background:#060;color:#fff;}
+.removed {background:#900;color:#fff;}
+.first {margin-left:0;padding-left:0;}
+.last {margin-right:0;padding-right:0;}
+.top {margin-top:0;padding-top:0;}
+.bottom {margin-bottom:0;padding-bottom:0;}
+
+/* forms.css */
+label {font-weight:bold;}
+fieldset {padding:0 1.4em 1.4em 1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
+legend {font-weight:bold;font-size:1.2em;margin-top:-0.2em;margin-bottom:1em;}
+fieldset, #IE8#HACK {padding-top:1.4em;}
+legend, #IE8#HACK {margin-top:0;margin-bottom:0;}
+input[type=text], input[type=password], input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
+input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus {border-color:#666;}
+select {background-color:#fff;border-width:1px;border-style:solid;}
+input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
+input.text, input.title {width:300px;padding:5px;}
+input.title {font-size:1.5em;}
+textarea {width:390px;height:250px;padding:5px;}
+form.inline {line-height:3;}
+form.inline p {margin-bottom:0;}
+.error, .alert, .notice, .success, .info {padding:0.8em;margin-bottom:1em;border:2px solid #ddd;}
+.error, .alert {background:#fbe3e4;color:#8a1f11;border-color:#fbc2c4;}
+.notice {background:#fff6bf;color:#514721;border-color:#ffd324;}
+.success {background:#e6efc2;color:#264409;border-color:#c6d880;}
+.info {background:#d5edf8;color:#205791;border-color:#92cae4;}
+.error a, .alert a {color:#8a1f11;}
+.notice a {color:#514721;}
+.success a {color:#264409;}
+.info a {color:#205791;}
+
+/* grid.css */
+.container {width:95%;margin:0 auto;}
+.showgrid {background:url(src/grid.png);}
+.column, .span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12, .span-13, .span-14, .span-15, .span-16, .span-17, .span-18, .span-19, .span-20, .span-21, .span-22, .span-23, .span-24 {float:left;margin-right:10px;}
+.last {margin-right:0;}
+.span-1 {width:30px;}
+.span-2 {width:70px;}
+.span-3 {width:110px;}
+.span-4 {width:150px;}
+.span-5 {width:190px;}
+.span-6 {width:230px;}
+.span-7 {width:270px;}
+.span-8 {width:310px;}
+.span-9 {width:350px;}
+.span-10 {width:390px;}
+.span-11 {width:430px;}
+.span-12 {width:470px;}
+.span-13 {width:510px;}
+.span-14 {width:550px;}
+.span-15 {width:590px;}
+.span-16 {width:630px;}
+.span-17 {width:670px;}
+.span-18 {width:710px;}
+.span-19 {width:750px;}
+.span-20 {width:790px;}
+.span-21 {width:830px;}
+.span-22 {width:870px;}
+.span-23 {width:910px;}
+.span-24 {width:950px;margin-right:0;}
+input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 {border-left-width:1px;border-right-width:1px;padding-left:5px;padding-right:5px;}
+input.span-1, textarea.span-1 {width:18px;}
+input.span-2, textarea.span-2 {width:58px;}
+input.span-3, textarea.span-3 {width:98px;}
+input.span-4, textarea.span-4 {width:138px;}
+input.span-5, textarea.span-5 {width:178px;}
+input.span-6, textarea.span-6 {width:218px;}
+input.span-7, textarea.span-7 {width:258px;}
+input.span-8, textarea.span-8 {width:298px;}
+input.span-9, textarea.span-9 {width:338px;}
+input.span-10, textarea.span-10 {width:378px;}
+input.span-11, textarea.span-11 {width:418px;}
+input.span-12, textarea.span-12 {width:458px;}
+input.span-13, textarea.span-13 {width:498px;}
+input.span-14, textarea.span-14 {width:538px;}
+input.span-15, textarea.span-15 {width:578px;}
+input.span-16, textarea.span-16 {width:618px;}
+input.span-17, textarea.span-17 {width:658px;}
+input.span-18, textarea.span-18 {width:698px;}
+input.span-19, textarea.span-19 {width:738px;}
+input.span-20, textarea.span-20 {width:778px;}
+input.span-21, textarea.span-21 {width:818px;}
+input.span-22, textarea.span-22 {width:858px;}
+input.span-23, textarea.span-23 {width:898px;}
+input.span-24, textarea.span-24 {width:938px;}
+.append-1 {padding-right:40px;}
+.append-2 {padding-right:80px;}
+.append-3 {padding-right:120px;}
+.append-4 {padding-right:160px;}
+.append-5 {padding-right:200px;}
+.append-6 {padding-right:240px;}
+.append-7 {padding-right:280px;}
+.append-8 {padding-right:320px;}
+.append-9 {padding-right:360px;}
+.append-10 {padding-right:400px;}
+.append-11 {padding-right:440px;}
+.append-12 {padding-right:480px;}
+.append-13 {padding-right:520px;}
+.append-14 {padding-right:560px;}
+.append-15 {padding-right:600px;}
+.append-16 {padding-right:640px;}
+.append-17 {padding-right:680px;}
+.append-18 {padding-right:720px;}
+.append-19 {padding-right:760px;}
+.append-20 {padding-right:800px;}
+.append-21 {padding-right:840px;}
+.append-22 {padding-right:880px;}
+.append-23 {padding-right:920px;}
+.prepend-1 {padding-left:40px;}
+.prepend-2 {padding-left:80px;}
+.prepend-3 {padding-left:120px;}
+.prepend-4 {padding-left:160px;}
+.prepend-5 {padding-left:200px;}
+.prepend-6 {padding-left:240px;}
+.prepend-7 {padding-left:280px;}
+.prepend-8 {padding-left:320px;}
+.prepend-9 {padding-left:360px;}
+.prepend-10 {padding-left:400px;}
+.prepend-11 {padding-left:440px;}
+.prepend-12 {padding-left:480px;}
+.prepend-13 {padding-left:520px;}
+.prepend-14 {padding-left:560px;}
+.prepend-15 {padding-left:600px;}
+.prepend-16 {padding-left:640px;}
+.prepend-17 {padding-left:680px;}
+.prepend-18 {padding-left:720px;}
+.prepend-19 {padding-left:760px;}
+.prepend-20 {padding-left:800px;}
+.prepend-21 {padding-left:840px;}
+.prepend-22 {padding-left:880px;}
+.prepend-23 {padding-left:920px;}
+.border {padding-right:4px;margin-right:5px;border-right:1px solid #ddd;}
+.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #ddd;}
+.pull-1 {margin-left:-40px;}
+.pull-2 {margin-left:-80px;}
+.pull-3 {margin-left:-120px;}
+.pull-4 {margin-left:-160px;}
+.pull-5 {margin-left:-200px;}
+.pull-6 {margin-left:-240px;}
+.pull-7 {margin-left:-280px;}
+.pull-8 {margin-left:-320px;}
+.pull-9 {margin-left:-360px;}
+.pull-10 {margin-left:-400px;}
+.pull-11 {margin-left:-440px;}
+.pull-12 {margin-left:-480px;}
+.pull-13 {margin-left:-520px;}
+.pull-14 {margin-left:-560px;}
+.pull-15 {margin-left:-600px;}
+.pull-16 {margin-left:-640px;}
+.pull-17 {margin-left:-680px;}
+.pull-18 {margin-left:-720px;}
+.pull-19 {margin-left:-760px;}
+.pull-20 {margin-left:-800px;}
+.pull-21 {margin-left:-840px;}
+.pull-22 {margin-left:-880px;}
+.pull-23 {margin-left:-920px;}
+.pull-24 {margin-left:-960px;}
+.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float:left;position:relative;}
+.push-1 {margin:0 -40px 1.5em 40px;}
+.push-2 {margin:0 -80px 1.5em 80px;}
+.push-3 {margin:0 -120px 1.5em 120px;}
+.push-4 {margin:0 -160px 1.5em 160px;}
+.push-5 {margin:0 -200px 1.5em 200px;}
+.push-6 {margin:0 -240px 1.5em 240px;}
+.push-7 {margin:0 -280px 1.5em 280px;}
+.push-8 {margin:0 -320px 1.5em 320px;}
+.push-9 {margin:0 -360px 1.5em 360px;}
+.push-10 {margin:0 -400px 1.5em 400px;}
+.push-11 {margin:0 -440px 1.5em 440px;}
+.push-12 {margin:0 -480px 1.5em 480px;}
+.push-13 {margin:0 -520px 1.5em 520px;}
+.push-14 {margin:0 -560px 1.5em 560px;}
+.push-15 {margin:0 -600px 1.5em 600px;}
+.push-16 {margin:0 -640px 1.5em 640px;}
+.push-17 {margin:0 -680px 1.5em 680px;}
+.push-18 {margin:0 -720px 1.5em 720px;}
+.push-19 {margin:0 -760px 1.5em 760px;}
+.push-20 {margin:0 -800px 1.5em 800px;}
+.push-21 {margin:0 -840px 1.5em 840px;}
+.push-22 {margin:0 -880px 1.5em 880px;}
+.push-23 {margin:0 -920px 1.5em 920px;}
+.push-24 {margin:0 -960px 1.5em 960px;}
+.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float:left;position:relative;}
+div.prepend-top, .prepend-top {margin-top:1.5em;}
+div.append-bottom, .append-bottom {margin-bottom:1.5em;}
+.box {padding:1.5em;margin-bottom:1.5em;background:#e5eCf9;}
+hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 1.45em;border:none;}
+hr.space {background:#fff;color:#fff;visibility:hidden;}
+.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
+.clearfix, .container {display:block;}
+.clear {clear:both;}
commit fcc2b8397e263a8a077f6799f0ed0387e72426c8
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Thu Apr 14 17:42:03 2011 +0200
Updated 1st.README instructions for 2.2.4 -> 2.3.0
diff --git a/1st.README b/1st.README
index 42d2c22..1412589 100644
--- a/1st.README
+++ b/1st.README
@@ -129,95 +129,125 @@ Or alternatively if the Kolab server was stopped before the upgrade:
Upgrade from 2.2.4 to 2.3.0
---------------------------
-FIXME: Pakete entfernen
-FIXME: rfc2739.schema muss raus bzw darf niht zurückgemerged werden
-FIXME: Pakete recompilern für opelssl
+The new OpenLDAP version in this release of Kolab introduces many changes
+to the LDAP setup, please read and follow these instructions carefully,
+otherwise your setup might seem to work fine, but will not work reliably!
-OpenLDAP has been updated to version 2.4.23 in this release of Kolab. As this
-introduces many changes to your LDAP setup, please read these instructions
-carefully.
-
-Due to a change in OpenLDAP's core.schema the 'countryName' or 'c' attribute
-no longer allows using free text but only 2-letter codes from ISO 3166. If you
-use the 'countryName' attribute to store data, you will have to continue using
-your old core.schema or to replace your own values with ISO country codes.
-
-Both procedures are described here as follows.
-
-0. Make a backup of your installation and data stored inside /kolab
-
-1. The Kolab server must be stopped:
-
- # /kolab/bin/openpkg rc all stop
-
-2. Save the current LDAP data:
-
- Copy the contents of the openldap database, use a different output
- filename if you want. You should make sure that no other users can
- read the sensitive data contained in the ldif file, e.g. with umask
- (limited to the slapcat call by using parentheses):
-
- # (umask 077 && /kolab/sbin/slapcat > ~/kolab-2.2.4.ldif)
-
-3. Start the standard upgrade:
- (as described in the General update instructions)
-
- # sh install-kolab.sh 2>&1 | tee /root/kolab-update.log
-
-Replacing values (recommended)
-
-Because of the unlimited number of possible values we cannot provide an
-upgrade script. , but here is a little help for you:
+0. Make a backup of your installation and data stored inside /kolab
-4. To get a list of values used in the countryName attribute run
+1. The Kolab server must be stopped:
- # grep ^c: ~/kolab-2.2.4.ldif | awk '{print $2}' | sort -u
+ # /kolab/bin/openpkg rc all stop
-5. Replace the values with the ISO country codes from
- http://www.iso.org/iso/english_country_names_and_code_elements
- To replace for example "Germany" with the code "DE", run
+2. Save the current LDAP data:
- # sed 's|^c: Germany|c: DE|g' ~/kolab-2.2.4.ldif > ~/kolab-2.3.0.ldif
+ Copy the contents of the openldap database, use a different output
+ filename if you want. You should make sure that no other users can
+ read the sensitive data contained in the ldif file, e.g. with umask
+ (limited to the slapcat call by using parentheses):
-6. Import the ldif again
+ # (umask 077 && /kolab/sbin/slapcat > ~/kolab-2.2.4.ldif)
- # /kolab/sbin/slapadd < ~/new-format.ldif
+3. Some of the old Kolab packages must be removed to avoid conflicts
+ during the upgrade process:
-Keeping old values
+ # /kolab/bin/openpkg rpm -e --nodeps kolabd PHPUnit
-If you cannot change the countryName attributes of your users, you need do
-continue using your old core.schema. Make sure to do a backup before you
-upgrade to Kolab 2.3 and restore the file from the backup once the upgrade is
-done.
+4. When not using precompiled binary packages, you will need to remove
+ packages that link against openssl, unless they got updated in this
+ release. For an an update from 2.2.4 to 2.3.0, this can be done with:
-4. /kolab/etc/openldap/schema/core.schema will be saved as core.rpmsave,
- please move it back to the original name:
+ # /kolab/bin/openpkg rpm -e --nodeps \
+ apr curl imap perl-crypto perl-ssl postfix sasl
- # cd /kolab/etc/openldap && mv core.schema.rpmsave core.schema
+5. Start the standard upgrade:
+ (as described in the General update instructions)
- FIXME: verify that the file is really saved as rpmsave
- FIXME: is core.ldif needed?
+ # sh install-kolab.sh 2>&1 | tee /root/kolab-update.log
-In previous versions of the Kolab Server, the distinguishing name (dn) to name
-users was built from their common name (cn) attribute and the cn was built
-from the attributes 'givenName' (e.g. John) and 'sn' (Doe). Therefore it was
-not possible to have two users of the same name or two accounts for the same
-person (cn=John Doe) since each dn must be distinct.
+6. The LDAP server configuration was overwritten by the updated
+ openldap package. To allow running kolabconf, it has to be moved
+ back, except for the line that includes the removed rfc2739.schema:
+
+ # grep -v 'include.*rfc2739' \
+ < /kolab/etc/openldap/slapd.conf.rpmsave \
+ > /kolab/etc/openldap/slapd.conf
+
+7. Due to a change in OpenLDAP's core schema the 'countryName' or 'c'
+ attribute no longer allows using free text but only 2-letter codes
+ from ISO 3166. If you use the 'countryName' attribute to store text,
+ you will have to replace your own values with ISO country codes (the
+ recommended way) or adjust the core schema. To see a list of values
+ used in the countryName attribute (see above) run:
+
+ # awk '/^c:/ {print $2}' | sort -u
+
+ Because of the unlimited number of possible values we cannot provide
+ an upgrade script to replace the entries, but here is an example for
+ replacing "Germany" or "Deutschland" with the two-letter code "DE"
+ and "Switzerland" or "Schweiz" with "CH":
+
+ # (umask 077 && sed \
+ -e 's|^c: Germany$|c: DE|' \
+ -e 's|^c: Deutschland$|c: DE|' \
+ -e 's|^c: Switzerland$|c: CH|' \
+ -e 's|^c: Schweiz$|c: CH|' \
+ ~/kolab-2.2.4.ldif > ~/kolab-update.ldif)
+
+ http://www.iso.org/iso/english_country_names_and_code_elements
+ contains a list of possible ISO country codes.
+
+ Alternatively, if you cannot change the countryName attributes of
+ your users, you need to edit /kolab/etc/openldap/schema/core.schema
+ and /kolab/etc/openldap/schema/core.ldif and remove the line in each
+ file that contains "SYNTAX 1.3.6.1.4.1.1466.115.121.1.11" or use the
+ backup of both files you created in step 0.
+
+8. In previous versions of the Kolab Server, the Distinguished Name (dn)
+ of users was built from their common name (cn) attribute and the cn
+ was built from the attributes 'givenName' (e.g. John) and 'sn' (Doe).
+ Therefore it was not possible to have two users of the same name or
+ two accounts for the same person (cn=John Doe) since each dn must be
+ distinct.
+
+ Kolab 2.3 uses the 'uid' attribute to build the dn. This change is
+ backwards compatible. Existing users will continue to use the old dn
+ while new users will be created following the new scheme. This means
+ that you can create an account with the same cn after the upgrade.
+
+ To take however full advantage of the new scheme, you need to convert
+ your LDAP with the script 'kolab-cn2uid' which you can download from
+ http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/utils/admin/kolab-cn2uid
+ (https:// can be used to provide a secure download, if you import
+ the corresponding root certificate from https://ssl.intevation.de/)
+
+ If you want to convert your existing LDAP, please run the following
+ commands as root:
+
+ # if [ -f ~/kolab-new.ldif ]; then
+ mv ~/kolab-new.ldif ~/kolab-dn-cn.ldif
+ else
+ cp ~/kolab-2.2.4.ldif ~/kolab-dn-cn.ldif
+ fi
+ # (umask 077 && /kolab/bin/php \
+ kolab-cn2uid -i ~/kolab-dn-cn.ldif -o ~/kolab-new.ldif)
+
+9. Before starting the LDAP server the database must be restored from
+ the ldif:
-Kolab 2.3 uses the 'uid' attribute to build the dn. This change is backwards
-compatible. Existing users will continue to use the old dn while new users
-will be created following the new scheme. This means that you can create an
-account with the same cn after the upgrade.
+ # rm /kolab/var/openldap/openldap-data/*
+ # /kolab/sbin/slapadd -l ~/kolab-new.ldif
-To take however full advantage of the new scheme, you need to convert your
-LDAP with the script 'phpdn' from FIXME. To convert your existing
-LDAP, please run the following commands as root or user 'kolab':
+10. Manually transfer local changes of templates from .rpmsave into the
+ new templates and remove all .rpmsave files below /kolab/etc as
+ discussed in the "General update instructions" above.
-FIXME: needs to be checked
+11. Start the OpenLDAP, generate the configuration files and start the
+ Kolab server:
-# /kolab/sbin/slapcat > ~/old-format.ldif
-# php phpdn.php -i old-format.ldif -o new-format.ldif
-# /kolab/sbin/slappadd < ~/new-format.ldif
+ # /kolab/bin/openpkg rc openldap start
+ # /kolab/sbin/kolabconf -n
+ # /kolab/bin/openpkg rc all start
Synchronization between master and slaves is now performed using syncrepl
instead of slurpd. This change requires no further modifications on your side,
commit cc54dd94bc2711699235c5e2fd92117b7492e258
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Thu Apr 14 12:20:15 2011 +0200
1st.README: removed trailing spaces
diff --git a/1st.README b/1st.README
index d5b9872..42d2c22 100644
--- a/1st.README
+++ b/1st.README
@@ -133,12 +133,12 @@ FIXME: Pakete entfernen
FIXME: rfc2739.schema muss raus bzw darf niht zurückgemerged werden
FIXME: Pakete recompilern für opelssl
-OpenLDAP has been updated to version 2.4.23 in this release of Kolab. As this
-introduces many changes to your LDAP setup, please read these instructions
+OpenLDAP has been updated to version 2.4.23 in this release of Kolab. As this
+introduces many changes to your LDAP setup, please read these instructions
carefully.
-Due to a change in OpenLDAP's core.schema the 'countryName' or 'c' attribute
-no longer allows using free text but only 2-letter codes from ISO 3166. If you
+Due to a change in OpenLDAP's core.schema the 'countryName' or 'c' attribute
+no longer allows using free text but only 2-letter codes from ISO 3166. If you
use the 'countryName' attribute to store data, you will have to continue using
your old core.schema or to replace your own values with ISO country codes.
@@ -166,17 +166,17 @@ Both procedures are described here as follows.
Replacing values (recommended)
-Because of the unlimited number of possible values we cannot provide an
+Because of the unlimited number of possible values we cannot provide an
upgrade script. , but here is a little help for you:
4. To get a list of values used in the countryName attribute run
# grep ^c: ~/kolab-2.2.4.ldif | awk '{print $2}' | sort -u
-5. Replace the values with the ISO country codes from
+5. Replace the values with the ISO country codes from
http://www.iso.org/iso/english_country_names_and_code_elements
To replace for example "Germany" with the code "DE", run
-
+
# sed 's|^c: Germany|c: DE|g' ~/kolab-2.2.4.ldif > ~/kolab-2.3.0.ldif
6. Import the ldif again
@@ -185,9 +185,9 @@ upgrade script. , but here is a little help for you:
Keeping old values
-If you cannot change the countryName attributes of your users, you need do
-continue using your old core.schema. Make sure to do a backup before you
-upgrade to Kolab 2.3 and restore the file from the backup once the upgrade is
+If you cannot change the countryName attributes of your users, you need do
+continue using your old core.schema. Make sure to do a backup before you
+upgrade to Kolab 2.3 and restore the file from the backup once the upgrade is
done.
4. /kolab/etc/openldap/schema/core.schema will be saved as core.rpmsave,
@@ -198,19 +198,19 @@ done.
FIXME: verify that the file is really saved as rpmsave
FIXME: is core.ldif needed?
-In previous versions of the Kolab Server, the distinguishing name (dn) to name
-users was built from their common name (cn) attribute and the cn was built
-from the attributes 'givenName' (e.g. John) and 'sn' (Doe). Therefore it was
-not possible to have two users of the same name or two accounts for the same
+In previous versions of the Kolab Server, the distinguishing name (dn) to name
+users was built from their common name (cn) attribute and the cn was built
+from the attributes 'givenName' (e.g. John) and 'sn' (Doe). Therefore it was
+not possible to have two users of the same name or two accounts for the same
person (cn=John Doe) since each dn must be distinct.
-Kolab 2.3 uses the 'uid' attribute to build the dn. This change is backwards
-compatible. Existing users will continue to use the old dn while new users
-will be created following the new scheme. This means that you can create an
+Kolab 2.3 uses the 'uid' attribute to build the dn. This change is backwards
+compatible. Existing users will continue to use the old dn while new users
+will be created following the new scheme. This means that you can create an
account with the same cn after the upgrade.
-To take however full advantage of the new scheme, you need to convert your
-LDAP with the script 'phpdn' from FIXME. To convert your existing
+To take however full advantage of the new scheme, you need to convert your
+LDAP with the script 'phpdn' from FIXME. To convert your existing
LDAP, please run the following commands as root or user 'kolab':
FIXME: needs to be checked
@@ -219,9 +219,9 @@ FIXME: needs to be checked
# php phpdn.php -i old-format.ldif -o new-format.ldif
# /kolab/sbin/slappadd < ~/new-format.ldif
-Synchronization between master and slaves is now performed using syncrepl
-instead of slurpd. This change requires no further modifications on your side,
-but if you are running multiple Kolab servers, make sure to upgrade them at
+Synchronization between master and slaves is now performed using syncrepl
+instead of slurpd. This change requires no further modifications on your side,
+but if you are running multiple Kolab servers, make sure to upgrade them at
the same time.
commit ffa1995abd86fe51e79314e71dec5259a4e4778c
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Thu Apr 14 13:30:59 2011 +0200
openpkg: Fix release in Makefile
diff --git a/openpkg/Makefile b/openpkg/Makefile
index e16cf73..738b89a 100644
--- a/openpkg/Makefile
+++ b/openpkg/Makefile
@@ -6,7 +6,7 @@ PACKAGE=openpkg
DOWNLOAD_VERSION=20071227
OPENPKG_RELEASE=20071227
VERSION=20071227
-RELEASE=$(OPENPKG_RELEASE)_kolab2
+RELEASE=$(OPENPKG_RELEASE)_kolab3
SOURCE_URL=
SOURCE_0=
commit 42ab39a55eded9db247179cfb2be569df112dc16
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Thu Apr 14 13:25:25 2011 +0200
release-notes.txt: Update for openpkg commit
diff --git a/release-notes.txt b/release-notes.txt
index 6687478..7b53a11 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -37,6 +37,12 @@ Changes between 2.3-alpha and 2.3.0:
Update to 2.4.23
+ - openpkg-20071227-20071227_kolab3
+
+ kolab/issue4531 (/etc/init.d/kolab needs LSB headers)
+ kolab/issue4693 (Kolab 2.3-alpha install error on Debian squeeze)
+ kolab/issue4677 (Kolab server 2.2.4 fails to build on Ubuntu natty)
+
- php-5.3.5-20110301
Update to 5.3.5
commit 33191926334fba2bf22cdb930790ac26a4ac1679
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Thu Apr 14 13:21:25 2011 +0200
openpkg: kolab/issue4531 (/etc/init.d/kolab needs LSB headers)
diff --git a/openpkg/kolab.patch b/openpkg/kolab.patch
index 3d6e732..14aaa3d 100644
--- a/openpkg/kolab.patch
+++ b/openpkg/kolab.patch
@@ -17,7 +17,7 @@ diff -urN openpkg/openpkg.spec openpkg-kolab/openpkg.spec
# the package version/release
%define V_openpkg 20071227
-+%define V_release 20071227_kolab2
++%define V_release 20071227_kolab3
# the used software versions
%define V_rpm 4.2.1
@@ -39,6 +39,32 @@ diff -urN openpkg/openpkg.spec openpkg-kolab/openpkg.spec
# list of sources
Source0: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
+@@ -1950,6 +1949,25 @@
+ echo "## openpkg-${name} -- startup/shutdown transfer script for OpenPKG ${prefix} hierarchy"
+ echo "##"
+ echo ""
++ echo "# chkconfig: 99 00"
++ echo "# description: Kolab is a Groupware Solution for Emails, Appointments,\"
++ echo "# Contacts and more."
++ echo "# config: ${prefix}/etc/kolab/kolab.conf"
++ echo ""
++ echo "### BEGIN INIT INFO"
++ echo "# Provides: kolab spamassassin amavisd apache httpd clamav imapd postfix sasl saslauthd openldap MTA"
++ echo "# Required-Start: $local_fs $network $remote_fs $named"
++ echo "# Required-Stop: $local_fs $network $remote_fs"
++ echo "# Should-Start: $syslog"
++ echo "# Should-Stop: $syslog"
++ echo "# Default-Start: 2 3 4 5"
++ echo "# Default-Stop: 0 1 6"
++ echo "# Short-Description: Startup/Shutdown script for OpenPKG ${prefix} hierarchy"
++ echo "# Description: Kolab is a Groupware Solution for Emails, Appointments,"
++ echo "# Contacts and more. This script starts/stops the OpenPKG"
++ echo "# ${prefix} hierarchy."
++ echo "### END INIT INFO"
++ echo ""
+ echo "depend() {"
+ echo " after *"
+ echo "}"
diff -urN openpkg/rpmtool openpkg-kolab/rpmtool
--- openpkg/rpmtool 2007-10-11 22:40:43.000000000 +0200
+++ openpkg-kolab/rpmtool 2009-09-23 15:45:25.946152864 +0200
commit 08bbb799a6cb21be887abe791ff2f1a6f912a74f
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date: Thu Apr 14 11:59:58 2011 +0200
1st.README: 2.2.4 -> 2.3.0
diff --git a/1st.README b/1st.README
index 93fdefc..d5b9872 100644
--- a/1st.README
+++ b/1st.README
@@ -1,6 +1,6 @@
-Kolab Server 2.2 Install and Upgrade Information
+Kolab Server 2.3 Install and Upgrade Information
================================================
-(Version 20100629, Kolab Server 2.2.4)
+(Version 20110414, Kolab Server 2.3.0)
See http://kolab.org/ for general information about Kolab,
or look at http://wiki.kolab.org/ for specific topics.
commit cb1629d62a54718a8f25925d27ed1b4c2031ff9c
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Thu Apr 14 11:32:46 2011 +0200
release-notes.txt: Initial draft of 2.3.0 update instructions
diff --git a/1st.README b/1st.README
index d570044..93fdefc 100644
--- a/1st.README
+++ b/1st.README
@@ -126,6 +126,105 @@ Or alternatively if the Kolab server was stopped before the upgrade:
# /kolab/bin/openpkg rc all start
+Upgrade from 2.2.4 to 2.3.0
+---------------------------
+
+FIXME: Pakete entfernen
+FIXME: rfc2739.schema muss raus bzw darf niht zurückgemerged werden
+FIXME: Pakete recompilern für opelssl
+
+OpenLDAP has been updated to version 2.4.23 in this release of Kolab. As this
+introduces many changes to your LDAP setup, please read these instructions
+carefully.
+
+Due to a change in OpenLDAP's core.schema the 'countryName' or 'c' attribute
+no longer allows using free text but only 2-letter codes from ISO 3166. If you
+use the 'countryName' attribute to store data, you will have to continue using
+your old core.schema or to replace your own values with ISO country codes.
+
+Both procedures are described here as follows.
+
+0. Make a backup of your installation and data stored inside /kolab
+
+1. The Kolab server must be stopped:
+
+ # /kolab/bin/openpkg rc all stop
+
+2. Save the current LDAP data:
+
+ Copy the contents of the openldap database, use a different output
+ filename if you want. You should make sure that no other users can
+ read the sensitive data contained in the ldif file, e.g. with umask
+ (limited to the slapcat call by using parentheses):
+
+ # (umask 077 && /kolab/sbin/slapcat > ~/kolab-2.2.4.ldif)
+
+3. Start the standard upgrade:
+ (as described in the General update instructions)
+
+ # sh install-kolab.sh 2>&1 | tee /root/kolab-update.log
+
+Replacing values (recommended)
+
+Because of the unlimited number of possible values we cannot provide an
+upgrade script. , but here is a little help for you:
+
+4. To get a list of values used in the countryName attribute run
+
+ # grep ^c: ~/kolab-2.2.4.ldif | awk '{print $2}' | sort -u
+
+5. Replace the values with the ISO country codes from
+ http://www.iso.org/iso/english_country_names_and_code_elements
+ To replace for example "Germany" with the code "DE", run
+
+ # sed 's|^c: Germany|c: DE|g' ~/kolab-2.2.4.ldif > ~/kolab-2.3.0.ldif
+
+6. Import the ldif again
+
+ # /kolab/sbin/slapadd < ~/new-format.ldif
+
+Keeping old values
+
+If you cannot change the countryName attributes of your users, you need do
+continue using your old core.schema. Make sure to do a backup before you
+upgrade to Kolab 2.3 and restore the file from the backup once the upgrade is
+done.
+
+4. /kolab/etc/openldap/schema/core.schema will be saved as core.rpmsave,
+ please move it back to the original name:
+
+ # cd /kolab/etc/openldap && mv core.schema.rpmsave core.schema
+
+ FIXME: verify that the file is really saved as rpmsave
+ FIXME: is core.ldif needed?
+
+In previous versions of the Kolab Server, the distinguishing name (dn) to name
+users was built from their common name (cn) attribute and the cn was built
+from the attributes 'givenName' (e.g. John) and 'sn' (Doe). Therefore it was
+not possible to have two users of the same name or two accounts for the same
+person (cn=John Doe) since each dn must be distinct.
+
+Kolab 2.3 uses the 'uid' attribute to build the dn. This change is backwards
+compatible. Existing users will continue to use the old dn while new users
+will be created following the new scheme. This means that you can create an
+account with the same cn after the upgrade.
+
+To take however full advantage of the new scheme, you need to convert your
+LDAP with the script 'phpdn' from FIXME. To convert your existing
+LDAP, please run the following commands as root or user 'kolab':
+
+FIXME: needs to be checked
+
+# /kolab/sbin/slapcat > ~/old-format.ldif
+# php phpdn.php -i old-format.ldif -o new-format.ldif
+# /kolab/sbin/slappadd < ~/new-format.ldif
+
+Synchronization between master and slaves is now performed using syncrepl
+instead of slurpd. This change requires no further modifications on your side,
+but if you are running multiple Kolab servers, make sure to upgrade them at
+the same time.
+
+
Upgrade from 2.2.3 to 2.2.4
---------------------------
commit 556435baab11bc5b4dd9d6c1cc5080c7d4045ffc
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Thu Apr 14 11:11:07 2011 +0200
release-notes.txt: Update for Gunnar's patch
diff --git a/release-notes.txt b/release-notes.txt
index a3ef190..6687478 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -11,7 +11,7 @@ Changes between 2.3-alpha and 2.3.0:
- apache-2.2.17-20110328
kolab/issue4377 (Some logs are not included in the log rotation)
-
+
- apache-php-5.3.5-20110301
Update to 5.3.5
@@ -29,6 +29,10 @@ Changes between 2.3-alpha and 2.3.0:
kolab/issue4684 (No options in webclient -> Options -> Filters)
kolab/issue4683 (Forwards and spamfilter missing from filters)
+ - Kolab_FreeBusy-0.5.0-20110413
+
+ Fix missing "require" statements
+
- openldap-2.4.23-20110308
Update to 2.4.23
commit 96d71a6934123f7a526cc23d18550d8c8f52f857
Author: Gunnar Wrobel <wrobel at horde.org>
Date: Wed Apr 13 17:22:58 2011 +0000
Fix missing 'require' statements.
diff --git a/pear/Kolab_Freebusy/ChangeLog b/pear/Kolab_Freebusy/ChangeLog
index 9a1cefe..13ce156 100644
--- a/pear/Kolab_Freebusy/ChangeLog
+++ b/pear/Kolab_Freebusy/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-13 Gunnar Wrobel <p at rdus.de>
+
+ * patches/Kolab_FreeBusy-0.5.0/Kolab_FreeBusy_0.5.0_p1.patch:
+
+ Fix missing "require" statements.
+
2010-07-22 Gunnar Wrobel <p at rdus.de>
* patches/Kolab_FreeBusy-0.1.7/Kolab_FreeBusy_0.1.7_p3.patch:
diff --git a/pear/Kolab_Freebusy/Kolab_FreeBusy.spec b/pear/Kolab_Freebusy/Kolab_FreeBusy.spec
index c23e8a7..21bd15b 100644
--- a/pear/Kolab_Freebusy/Kolab_FreeBusy.spec
+++ b/pear/Kolab_Freebusy/Kolab_FreeBusy.spec
@@ -7,7 +7,7 @@
%define V_repo_commit
%define V_repo_release
%define V_version 0.5.0
-%define V_release 20101010
+%define V_release 20110413
%define V_sourceurl http://pear.horde.org/get
%define V_php_lib_loc php
%define V_www_loc freebusy
diff --git a/pear/Kolab_Freebusy/package.info b/pear/Kolab_Freebusy/package.info
index b667e67..2a7aef3 100644
--- a/pear/Kolab_Freebusy/package.info
+++ b/pear/Kolab_Freebusy/package.info
@@ -16,7 +16,7 @@ package_origin='WGET'
version='0.5.0'
# Package release number
-release='20101010'
+release='20110413'
# Source URL to download from
sourceurl='http://files.kolab.org/server/development-2.3/externals'
diff --git a/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.0/Kolab_FreeBusy_0.5.0_p1.patch b/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.0/Kolab_FreeBusy_0.5.0_p1.patch
new file mode 100644
index 0000000..7c41abe
--- /dev/null
+++ b/pear/Kolab_Freebusy/patches/Kolab_FreeBusy-0.5.0/Kolab_FreeBusy_0.5.0_p1.patch
@@ -0,0 +1,32 @@
+From: Gunnar Wrobel <wrobel at pardus.de>
+Subject: [PATCH] Kolab_FreeBusy_0.5.0_p1.patch
+
+Fixes missing "require" statements.
+
+STATUS: MERGED
+
+Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>
+
+--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy.php 10 Oct 2010 18:37:56 -0000 1.10.2.4
++++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy.php 13 Apr 2011 17:09:49 -0000
+@@ -604,7 +604,11 @@
+ }
+
+ /* Load the cache class now */
++ require_once 'Horde/Kolab/FreeBusy/Logger.php';
+ require_once 'Horde/Kolab/FreeBusy/Cache.php';
++ require_once 'Horde/Kolab/FreeBusy/Cache/Acl.php';
++ require_once 'Horde/Kolab/FreeBusy/Cache/Acl/Base.php';
++ require_once 'Horde/Kolab/FreeBusy/Cache/Partial.php';
+ require_once 'Horde/Kolab/FreeBusy/Cache/Structure.php';
+ require_once 'Horde/Kolab/FreeBusy/Cache/Structure/Base.php';
+ require_once 'Horde/Kolab/FreeBusy/Cache/Structure/Decorator/Log.php';
+--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php 10 Oct 2010 18:37:56 -0000 1.17.2.13
++++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php 13 Apr 2011 17:09:49 -0000
+@@ -11,6 +11,7 @@
+ require_once 'Horde/Kolab/FreeBusy/Cache/File.php';
+ require_once 'Horde/Kolab/FreeBusy/Cache/File/Pvcal.php';
+ require_once 'Horde/Kolab/FreeBusy/Cache/Db.php';
++require_once 'Horde/Kolab/FreeBusy/Cache/Db/Base.php';
+ require_once 'Horde/Kolab/FreeBusy/Cache/Db/Acl.php';
+ require_once 'Horde/Kolab/FreeBusy/Cache/Db/Xacl.php';
commit 1fe13972dffc1fa344a6958b56a631c9954fc3da
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Thu Apr 14 01:08:25 2011 +0200
perl-kolab: Fix Source_URL, perl-kolab is not external
diff --git a/perl-kolab/Makefile b/perl-kolab/Makefile
index 1ecb93a..b29cc49 100644
--- a/perl-kolab/Makefile
+++ b/perl-kolab/Makefile
@@ -5,7 +5,7 @@ VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9.]*\).*/\1/")
#SOURCE_URL=http://www.smarty.net/distributions/
-SOURCE_URL=http://files.kolab.org/server/development-2.3/externals
+SOURCE_URL=http://files.kolab.org/server/development-2.3/sources
SOURCE_0=perl-kolab-$(VERSION).tar.gz
BUILD_OPTIONS=
commit 2f36f48e83d8a73c7885215c755249baef711c5d
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Thu Apr 14 01:07:20 2011 +0200
perl-kolab: Bumb internal version numbers, too
diff --git a/perl-kolab/perl-kolab.spec b/perl-kolab/perl-kolab.spec
index bf1cecc..6ddb27b 100644
--- a/perl-kolab/perl-kolab.spec
+++ b/perl-kolab/perl-kolab.spec
@@ -26,8 +26,8 @@
# versions of individual parts
%define V_perl 5.8.8
%define V_package perl-kolab
-%define V_version 2.3
-%define V_release 20110412
+%define V_version 2.3.0
+%define V_release 20110414
# package information
Name: %{V_package}
diff --git a/perl-kolab/perl-kolab/lib/Kolab.pm b/perl-kolab/perl-kolab/lib/Kolab.pm
index a12846d..c827f04 100644
--- a/perl-kolab/perl-kolab/lib/Kolab.pm
+++ b/perl-kolab/perl-kolab/lib/Kolab.pm
@@ -59,10 +59,10 @@ our @EXPORT = qw(
);
# The Kolab version number for the perl-kolab package
-our $KOLAB_BASE_VERSION = "2.3";
+our $KOLAB_BASE_VERSION = "2.3.0";
# Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 1;
+my $KOLAB_CVS = 0;
our $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
commit 9bbb5c1f88a1615b8864e6ed14e700ae6d56bcab
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Wed Apr 13 16:10:28 2011 +0200
Update release-notes.txt for release
diff --git a/release-notes.txt b/release-notes.txt
index 38ec3e2..a3ef190 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -6,13 +6,41 @@ For upgrading and installation instructions, please refer to
the 1st.README file in the package directory.
-Changes between 2.3-alpha and 2.3-?:
+Changes between 2.3-alpha and 2.3.0:
+
+ - apache-2.2.17-20110328
+
+ kolab/issue4377 (Some logs are not included in the log rotation)
+
+ - apache-php-5.3.5-20110301
+
+ Update to 5.3.5
+
+ - clamav-0.9.7-20110301
+
+ Update to 0.9.7
+
+ - imapd-2.3.16-20110328_kolab1
+
+ kolab/issue4377 (Some logs are not included in the log rotation)
- ingo-1.2.5-20110111
kolab/issue4684 (No options in webclient -> Options -> Filters)
kolab/issue4683 (Forwards and spamfilter missing from filters)
+ - openldap-2.4.23-20110308
+
+ Update to 2.4.23
+
+ - php-5.3.5-20110301
+
+ Update to 5.3.5
+
+ - z-push-1.5.1-1
+
+ Update to 1.5.1
+
Changes between 2.2.4 and 2.3-alpha:
commit 87e81927145bf516d0a9fd32bbaaca4e1736b5e4
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Wed Apr 13 16:03:44 2011 +0200
imapd: Bump release because of the fix for kolab/issue4377
diff --git a/imapd/imapd.spec b/imapd/imapd.spec
index 96b7322..751db6a 100644
--- a/imapd/imapd.spec
+++ b/imapd/imapd.spec
@@ -32,7 +32,7 @@ Class: BASE
Group: Mail
License: BSD
Version: 2.3.16
-Release: 20081020_kolab7
+Release: 20110328_kolab1
# package options
%option with_fsl yes
commit 417c04238a6437f25e28655a5d1737acca6ed2d2
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Wed Apr 13 16:03:16 2011 +0200
apache: Bump release because of the fix for kolab/issue4377
diff --git a/apache/apache.spec b/apache/apache.spec
index 5120fae..c67862f 100644
--- a/apache/apache.spec
+++ b/apache/apache.spec
@@ -32,7 +32,7 @@ Class: BASE
Group: Web
License: ASF
Version: 2.2.17
-Release: 20100406
+Release: 20110328
# package options
%option with_mpm_prefork yes
commit 790ce4ab6e57ad8eecfd9b133fe832e5ad8477d9
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Wed Apr 13 15:02:10 2011 +0200
Makefile: Remove Horde_Log Horde_SpellChecker, Horde_Text_Diff, Horde_Text_Textile, Horde_VC, Horde_Yaml, PEAR-Cache and PEAR-Services_Weather. Gunnar said these modules are not required for Horde
diff --git a/Makefile b/Makefile
index 5053236..5d00993 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ PEAR_CHANNEL_PACKAGES= \
PEAR_ONLY_PACKAGES= \
pear/PEAR-Auth_SASL \
- pear/PEAR-Cache \
pear/PEAR-Console_Table \
pear/PEAR-DB \
pear/PEAR-Date \
@@ -66,7 +65,6 @@ PEAR_ONLY_PACKAGES= \
pear/PEAR-Net_Socket \
pear/PEAR-Net_URL \
pear/PEAR-SOAP \
- pear/PEAR-Services_Weather \
pear/PEAR-XML_Parser \
pear/PEAR-XML_Serializer \
pear/PEAR-XML_Util \
@@ -103,7 +101,6 @@ PEAR_HORDE_PACKAGES= \
pear/Horde_LDAP \
pear/Horde_Loader \
pear/Horde_Lock \
- pear/Horde_Log \
pear/Horde_MIME \
pear/Horde_Maintenance \
pear/Horde_Mobile \
@@ -119,22 +116,17 @@ PEAR_HORDE_PACKAGES= \
pear/Horde_SessionHandler \
pear/Horde_SessionObjects \
pear/Horde_Share \
- pear/Horde_SpellChecker \
pear/Horde_SyncML \
pear/Horde_Template \
- pear/Horde_Text_Diff \
pear/Horde_Text_Filter \
pear/Horde_Text_Flowed \
- pear/Horde_Text_Textile \
pear/Horde_Token \
pear/Horde_Tree \
pear/Horde_UI \
pear/Horde_Util \
- pear/Horde_VC \
pear/Horde_VFS \
pear/Horde_XML_WBXML \
pear/Horde_Xml_Element \
- pear/Horde_Yaml \
pear/Horde_iCalendar
PEAR_KOLAB_PACKAGES= \
commit b4990ed3e4410c296d7a719e0042a29bea62d109
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Wed Apr 13 14:11:30 2011 +0200
Kolab_Filter: Require Kolab_Resource
diff --git a/pear/Kolab_Filter/Kolab_Filter.spec b/pear/Kolab_Filter/Kolab_Filter.spec
index 34a5faf..f476755 100644
--- a/pear/Kolab_Filter/Kolab_Filter.spec
+++ b/pear/Kolab_Filter/Kolab_Filter.spec
@@ -50,6 +50,7 @@ PreReq: PEAR-Horde-Channel
PreReq: Kolab_Format >= 1.0.1
PreReq: Kolab_Server >= 0.5.0
PreReq: Kolab_Storage >= 0.4.0
+PreReq: Kolab_Resource >= 0.1.0
PreReq: PEAR-HTTP_Request
PreReq: PEAR-Net_LMTP
PreReq: PEAR-Net_SMTP
More information about the commits
mailing list