For some operating systems you might find additional directories containing pre-compiled packages, e.g. -ix86-debian4.0 for Debian/etch on 32bit x86 systems. +ix86-debian5.0 for Debian/lenny on 32bit x86 systems. Using them usually considerably reduces installation time.

@@ -104,7 +104,7 @@
Uptodate, tested and supported packages for specific distributions can be ordered from the -Kolab Konsortium. +Kolab Systems AG. m4_include(footer.html.m4) Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.173 retrieving revision 1.174 diff -u -d -r1.173 -r1.174 --- index.html.m4 2 Mar 2010 15:30:49 -0000 1.173 +++ index.html.m4 1 Jul 2010 13:35:02 -0000 1.174 @@ -59,6 +59,20 @@

+ + +

July 1st, 2010

» + Kolab Server 2.2.4 Final Release +

+ This release contains 20 enhancements and fixes compared to 2.2.3.
+ Source and binary packages are available from the download page.
+ See the announcement for details. +

+ + +'; $str .= ''; if( ereg( 'readonly', $value['attrs'] ) ) { - $str .= ''; + $str .= ''; } else { $str .= '

March 1st, 2010 » Kolab Systems AG re-launches Free Software groupware business Index: roadmap.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- roadmap.html.m4 19 May 2010 09:18:18 -0000 1.33 +++ roadmap.html.m4 1 Jul 2010 13:35:02 -0000 1.34 @@ -7,13 +7,6 @@ This roadmap lists the main development goals and estimated dates of release. -
-There are of course many more -wishes -and -features -listed in the Kolab issue tracker. This is only a rough overview. -
Kolab Server 2.2

@@ -31,10 +24,12 @@ 2.2.3 was published on December 23rd, 2009. It contains important bugfixes and improvements.
-It is planned to have further improvements in a release -2.2.4 in second quarter of 2010 and a release 2.3.0 later in 2010. +2.2.4 was published on July 1st, 2010. +It contains security updates, important bugfixes and improvements.
-Kolab Systems is currently +It is planned to have a release 2.3.0 with new features (e.g. improved directory service) in 2010. +
+Kolab Systems AG is currently working on native packages for Debian and Fedora.
Kolab Server 2.1 release series
From cvs at kolab.org Thu Jul 1 15:37:30 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 1 Jul 2010 15:37:30 +0200 (CEST) Subject: thomas: doc/www/src download.html.m4,1.24,1.25 Message-ID: <20100701133730.C58AD60057F@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv31634 Modified Files: download.html.m4 Log Message: remove stray 'dnl' Index: download.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/download.html.m4,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- download.html.m4 1 Jul 2010 13:35:02 -0000 1.24 +++ download.html.m4 1 Jul 2010 13:37:28 -0000 1.25 @@ -68,7 +68,7 @@ packages with all the numerous small differences.
-m4_changequote(`[', `]')dnl +m4_changequote(`[', `]') The most important directories for downloading server packages are:
@@ -81,7 +81,7 @@
(alternatively use one of our download mirrors) -m4_changequote([`],['])dnl +m4_changequote([`],['])
The release and beta directories will contain a sources subdirectory From cvs at kolab.org Thu Jul 1 15:43:53 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 1 Jul 2010 15:43:53 +0200 (CEST) Subject: thomas: doc/www/src roadmap.html.m4,1.34,1.35 Message-ID: <20100701134353.B59F460057E@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv32075 Modified Files: roadmap.html.m4 Log Message: Updated list of distributions kolabsys is working on Index: roadmap.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- roadmap.html.m4 1 Jul 2010 13:35:02 -0000 1.34 +++ roadmap.html.m4 1 Jul 2010 13:43:51 -0000 1.35 @@ -30,7 +30,8 @@ It is planned to have a release 2.3.0 with new features (e.g. improved directory service) in 2010.
Kolab Systems AG is currently -working on native packages for Debian and Fedora. +working on native packages for Debian GNU/Linux, Red Hat Enterprise Linux, +CentOS and Fedora.
Kolab Server 2.1 release series
Current is 2.1.0 Final. No further releases planned. From cvs at kolab.org Thu Jul 1 16:25:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 1 Jul 2010 16:25:48 +0200 (CEST) Subject: wilde: utils/testing send_filtertest_emails_new.py,NONE,1.1 Message-ID: <20100701142548.6D910600585@lists.intevation.de> Author: wilde Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv1379 Added Files: send_filtertest_emails_new.py Log Message: Added new Kolab Filter test script. This is heavily based on the old one but improved in some details and with new tests to fit the current status of kolab/issue954. --- NEW FILE: send_filtertest_emails_new.py --- #!/usr/bin/env python """Create and send testmails for envelope <-> header checks for Kolab2 Server. You need to specify --maildomain and --username on the command line with the real values for a test account on your server. For test cases which need authentication you have to specify --password and maybe --loginname (if loginname is not given username at maildomain is used). This script needs to be run from a system which is "out of bounds" for the kolab-server, so the option "Accept Internet Mail" must be set on the server and the system running this script MUST NOT be in the "Privileged Networks" of the kolab server (or local, that is 127.0.0.1). The Mail Filter tests are not performed on hosts in Privileged Networks! This script is Free Software under the GNU General Public License >=v2. Bernhard Reiter Sascha Wilde """ #20041217 Bernhard initial # This script is heavily based on send_filtertest_emails.py but it has # been changed to test cases according to the diagram from the german # operatin manual # # page 50 and to variouse cases described in kolab/issue954. # # Documentation and some functionality was reworked, too... __version__="$Revision: 1.1 $"[10:-1] import sys import time import smtplib import string import getopt import traceback import random def send_mail(envelope_from, envelope_to, header_from, header_to, test_number=-1, smtp_host="localhost", smtp_port = None, loginname = None, password = None, text = "this is a kolab testmail", expect_reject = False): basemsg=("From: %s\r\nTo: %s\r\n%%s\r\n" % (header_from, string.join(header_to, ", ")) ) headers="MIME-Version: 1.0\r\n"+ \ "Content-Type: text/plain;\r\n"+ \ " charset=\"UTF-8\"\r\n"+ \ "Content-Transfer-Encoding: 8bit\r\n" subject="Subject: Mail Filter Test %d\r\n" % int(test_number) head=basemsg % (headers + subject) msg = head + "Kolab Mail Filter sender checks.\n" + text + "\n" try: server=smtplib.SMTP(smtp_host, smtp_port) if loginname != None and password != None: server.starttls() server.login(loginname,password) server.set_debuglevel(1) server.sendmail(envelope_from,envelope_to,msg) sys.stdout.write(".") sys.stdout.flush() server.quit() except: if not expect_reject: print "Error sending mail %d" % (test_number,) traceback.print_exc() else: print "Could not send mail %d" % (test_number,) + \ "\nBody: " + text + \ "\nThis was EXPECTED!" def assemble_email_address(username, domain, realname = None): """Assemble an email address from a realname, a username and a domain. If realname is given and not None, the return value is a string with realname followed by a space and the emailaddress username at domain in angle brackets. If realname is omitted or None, the return value is just the email address username at domain. """ if realname is not None: return "%(realname)s <%(username)s@%(domain)s>" % locals() else: return "%(username)s@%(domain)s" % locals() def main(argv): # default values for the parameters # Domain used in the email addresses maildomain = None # username. username at maildomain will be the email address used username = None # alias. alias at maildomain should be a valid alias or delegate for # username at maildomain alias = None # smtp username loginname = None # password. smtp password for username at maildomain password = None # The real name part of an email address, # i.e. "realname " realname = None # SMTP host and port to use when sending the test mails smtp_host = None smtp_port = 25 # parse the command line opts, args = getopt.getopt(argv[1:], 'h:p:', ["smtp-host=", "smtp-port=", "maildomain=", "username=", "alias=", "loginname=", "password=", "realname=", 'version']) for optchar, value in opts: if optchar in ("-h", "--smtp-host"): smtp_host = value elif optchar in ("-p", "--smtp-port"): smtp_port = int(value) elif optchar == "--maildomain": maildomain = value elif optchar == "--username": username = value elif optchar == "--alias": alias = value elif optchar == "--loginname": loginname = value elif optchar == "--password": password = value elif optchar == "--realname": realname = value elif optchar == "--version": print __version__ return else: print >>sys.stderr, "unknown option %r" % optchar error = False if maildomain is None: print >>sys.stderr, "--maildomain missing" error = True if username is None: print >>sys.stderr, "--username missing" error = True if smtp_host is None: print >>sys.stderr, "--smtp-host missing" error = True if not error and '@' in username: print >>sys.stderr, "error: \"@\" in username!" error = True if error: sys.exit(1) envelope_to = assemble_email_address(username, maildomain, realname) header_to= [assemble_email_address(username, maildomain)] envelope_from = envelope_to header_from = assemble_email_address(username, maildomain) subdom_header_from = assemble_email_address(username, "sub."+maildomain) nonexistent_local_address = assemble_email_address( ''.join([random.choice(string.letters + string.digits) for i in range(10)]), maildomain) if alias != None: alias_address = assemble_email_address(alias, maildomain) if loginname is None: loginname = envelope_from # Tests # number : expected behaviour to pass the test : description # Authenticated tests if password is None: print >>sys.stderr, "No password was given, skipping authenticated tests!" else: # 0: delivered: Are we functional? Does the default case work? send_mail(envelope_from, envelope_to, header_from, header_to, 0, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, text = "Regualr authenticated mail" + "Expected result: delivery") # 1: delivered: different letter cases in the header_from send_mail(envelope_from, envelope_to, header_from.swapcase(), header_to, 1, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, text = "Authenticated mail with changed case in From-header.\n" + "Expected result: delivery") # 2: bounce mail: envelope_from is ok, but header_from is forged external send_mail(envelope_from, envelope_to, "rumpelstilzchen at big.invalid", header_to, 2, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, text = "Authenticated mail with forged external From-header.\n" + "Expected result: bounce") # 3: bounce mail: envelope_from is ok, but header_from is forged nonexistent local send_mail(envelope_from, envelope_to, nonexistent_local_address, header_to, 3, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, text = "Authenticated mail with forged local From-header.\n" + "Expected result: bounce") # 4: reject mail: envelope_from is forged external, header_from is ok send_mail( "rumpelstilzchen at big.invalid", envelope_to, header_from, header_to, 4, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, text = "Authenticated mail with forged external envelope-sender.\n" + "Expected result: rejected by postfix", expect_reject = True) # 5: reject mail: envelope_from is forged local, header_from is ok send_mail(nonexistent_local_address, envelope_to, header_from, header_to, 5, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, text = "Authenticated mail with forged local envelope-sender.\n" + "Expected result: rejected by postfix", expect_reject = True) if alias is None: print >>sys.stderr, "No alias was given, skipping alias tests!" else: # 6: delivered: envelope_from and header_from are an alias for user send_mail(alias_address, envelope_to, alias_address, header_to, 6, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, text = "Authenticated mail, env-sender and From-header being alias.\n" + "Expected result: delivery") # 7: bounce?: envelope_from is an alias for user, but from # is primary user address # msg25586, kolab/issue954 send_mail(alias_address, envelope_to, header_from, header_to, 7, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, text = "Authenticated mail, env-sender alias, From-header user.\n" + "Expected result: bounce?") # 8: bounce?: envelope_from is primary user address, but from # is an (valid) alias # msg25586, kolab/issue954 send_mail(envelope_from, envelope_to, alias_address, header_to, 8, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, text = "Authenticated mail, env-sender user, From-header alias.\n" + "Expected result: bounce?") # forged envelope intern an extern... # # 3: delivered, no mailer-daemon in kolabfilter log: # # issue774 (null senders not handled by kolabfilter...) # # Doesn't work currently, rewriting is missing. # send_mail("<>", envelope_to, "some at non-existing.invalid", header_to, 3, # smtp_host = smtp_host, smtp_port = smtp_port, # loginname = loginname, password = password, # text = "Kolab filter testmail.\nExpected result: delivery, from header rewritten") # # 3.1: delivered, mailer-daemon like mail with legal From: # send_mail("<>", envelope_to, header_from, header_to, 3.1, # smtp_host = smtp_host, smtp_port = smtp_port, # loginname = loginname, password = password, # text = "Kolab filter testmail.\nExpected result: delivery, from header rewritten") # # 4: reject, user can't use sender address "x-commit..." # send_mail("x-commits-bounces-+y=malinglist.org at example.org", envelope_to, # header_from, header_to, 4, # smtp_host = smtp_host, smtp_port = smtp_port, # loginname = loginname, password = password, # text = "Kolab filter testmail.\nExpected result: reject") # # 5: reject, user can't use from address "$user at sub.$domain" # send_mail( envelope_from, envelope_to, # subdom_header_from, header_to, 5, # smtp_host = smtp_host, smtp_port = smtp_port, # loginname = loginname, password = password, # text = "Kolab filter testmail.\nExpected result: reject") # Unauthenticated tests # # 10: reject: unauthenticated user trying to send # send_mail(envelope_from, envelope_to, header_from, header_to, 10, # smtp_host = smtp_host, smtp_port = smtp_port, # text = "Kolab filter testmail.\nExpected result: reject") # # 11: delivered, no mailer-daemon in kolabfilter log: # # issue774 (null senders not handled by kolabfilter...) # send_mail("<>", envelope_to, "some at non-existing.invalid", header_to, 11, # smtp_host = smtp_host, smtp_port = smtp_port, # text = "Kolab filter testmail.\nExpected result: delivery") # # 12: delivered, no Invalid From: header in postfix log: # # issue783 (envelope header from check has problems with mailinglists) # send_mail("x-commits-bounces-+y=malinglist.org at example.org", envelope_to, # header_from, header_to, 12, # smtp_host = smtp_host, smtp_port = smtp_port, # text = "Kolab filter testmail.\nExpected result: delivery, from header rewritten") # # 12.1: delivered, no Invalid From: header in postfix log: # send_mail("blah at example.org", envelope_to, # "\"\\\\blah\\\"\" ", header_to, 12.1, # smtp_host = smtp_host, smtp_port = smtp_port, # text = "Kolab filter testmail.\nExpected result: delivery, from header rewritten") # # 13: if( verify_subdomains) rewrite, user can't use from header "$user at sub.$domain" # # 13: if( !verify_subdomains) delivered # send_mail( "someone at non-existing.invalid", envelope_to, # subdom_header_from, header_to, 13, # smtp_host = smtp_host, smtp_port = smtp_port, # text = "Kolab filter testmail.\nExpected result: if( verify_subdomains) from header rewritten, else delivered") if __name__=="__main__": main(sys.argv) From cvs at kolab.org Thu Jul 1 17:04:49 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 1 Jul 2010 17:04:49 +0200 (CEST) Subject: wilde: utils/testing send_filtertest_emails_new.py,1.1,1.2 Message-ID: <20100701150449.AE1DF600587@lists.intevation.de> Author: wilde Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv2486 Modified Files: send_filtertest_emails_new.py Log Message: Added a bunch on unauthenticated tests. Index: send_filtertest_emails_new.py =================================================================== RCS file: /kolabrepository/utils/testing/send_filtertest_emails_new.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- send_filtertest_emails_new.py 1 Jul 2010 14:25:46 -0000 1.1 +++ send_filtertest_emails_new.py 1 Jul 2010 15:04:47 -0000 1.2 @@ -188,6 +188,8 @@ if loginname is None: loginname = envelope_from + external_address = "rumpelstilzchen at big.invalid" + # Tests # number : expected behaviour to pass the test : description @@ -211,7 +213,7 @@ "Expected result: delivery") # 2: bounce mail: envelope_from is ok, but header_from is forged external - send_mail(envelope_from, envelope_to, "rumpelstilzchen at big.invalid", + send_mail(envelope_from, envelope_to, external_address, header_to, 2, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, @@ -227,7 +229,7 @@ "Expected result: bounce") # 4: reject mail: envelope_from is forged external, header_from is ok - send_mail( "rumpelstilzchen at big.invalid", envelope_to, header_from, + send_mail( external_address, envelope_to, header_from, header_to, 4, smtp_host = smtp_host, smtp_port = smtp_port, loginname = loginname, password = password, @@ -269,8 +271,6 @@ loginname = loginname, password = password, text = "Authenticated mail, env-sender user, From-header alias.\n" + "Expected result: bounce?") - -# forged envelope intern an extern... # # 3: delivered, no mailer-daemon in kolabfilter log: # # issue774 (null senders not handled by kolabfilter...) @@ -303,10 +303,47 @@ # Unauthenticated tests - # # 10: reject: unauthenticated user trying to send - # send_mail(envelope_from, envelope_to, header_from, header_to, 10, - # smtp_host = smtp_host, smtp_port = smtp_port, - # text = "Kolab filter testmail.\nExpected result: reject") + # 10: delivered: default allowed case: external mail to local user + send_mail(external_address, envelope_to, external_address, header_to, 10, + smtp_host = smtp_host, smtp_port = smtp_port, + text = "Regualr unauthenticated mail, external address to local" + + "Expected result: delivery") + + # 11: reject: try to relay unauthenticated + send_mail(external_address, external_address, external_address, external_address, 11, + smtp_host = smtp_host, smtp_port = smtp_port, expect_reject = True, + text = "Unauthenticated relay, external address to external address" + + "Expected result: reject") + + # 12: reject: try to relay unauthenticated, local sender + send_mail(envelope_from, external_address, header_from, external_address, 12, + smtp_host = smtp_host, smtp_port = smtp_port, expect_reject = True, + text = "Unauthenticated relay, local to external address" + + "Expected result: reject") + + # 13: deliver+rewrite: unauthenticatel local from/sender to local recipient + send_mail(envelope_from, envelope_to, header_from, header_to, 13, + smtp_host = smtp_host, smtp_port = smtp_port, + text = "Unauthenticated local to local address" + + "Expected result: rewrite From") + + # 14: deliver+rewrite: unauthenticatel local env-sender and + # external From to local recipient + # msg10823 and msg25579, case 2, kolab/issue954 + send_mail(envelope_from, envelope_to, external_address, header_to, 14, + smtp_host = smtp_host, smtp_port = smtp_port, + text = "Unauthenticated local env-sender, external From to local" + + "Expected result: rewrite From") + + if alias is None: + print >>sys.stderr, "No alias was given, skipping alias tests!" + else: + # 15: deliver+rewrite: unauthenticatel local env-sender and + # valid alias From to local recipient + send_mail(envelope_from, envelope_to, alias_address, header_to, 15, + smtp_host = smtp_host, smtp_port = smtp_port, + text = "Unauthenticated local env-sender, valid alias to local" + + "Expected result: rewrite From") # # 11: delivered, no mailer-daemon in kolabfilter log: # # issue774 (null senders not handled by kolabfilter...) From cvs at kolab.org Thu Jul 1 17:09:17 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 1 Jul 2010 17:09:17 +0200 (CEST) Subject: wilde: utils/testing send_filtertest_emails_new.py,1.2,1.3 Message-ID: <20100701150917.87FEC600589@lists.intevation.de> Author: wilde Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv2875 Modified Files: send_filtertest_emails_new.py Log Message: Removed old commented out tests. Index: send_filtertest_emails_new.py =================================================================== RCS file: /kolabrepository/utils/testing/send_filtertest_emails_new.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- send_filtertest_emails_new.py 1 Jul 2010 15:04:47 -0000 1.2 +++ send_filtertest_emails_new.py 1 Jul 2010 15:09:15 -0000 1.3 @@ -272,34 +272,6 @@ text = "Authenticated mail, env-sender user, From-header alias.\n" + "Expected result: bounce?") - # # 3: delivered, no mailer-daemon in kolabfilter log: - # # issue774 (null senders not handled by kolabfilter...) - # # Doesn't work currently, rewriting is missing. - # send_mail("<>", envelope_to, "some at non-existing.invalid", header_to, 3, - # smtp_host = smtp_host, smtp_port = smtp_port, - # loginname = loginname, password = password, - # text = "Kolab filter testmail.\nExpected result: delivery, from header rewritten") - - # # 3.1: delivered, mailer-daemon like mail with legal From: - # send_mail("<>", envelope_to, header_from, header_to, 3.1, - # smtp_host = smtp_host, smtp_port = smtp_port, - # loginname = loginname, password = password, - # text = "Kolab filter testmail.\nExpected result: delivery, from header rewritten") - - # # 4: reject, user can't use sender address "x-commit..." - # send_mail("x-commits-bounces-+y=malinglist.org at example.org", envelope_to, - # header_from, header_to, 4, - # smtp_host = smtp_host, smtp_port = smtp_port, - # loginname = loginname, password = password, - # text = "Kolab filter testmail.\nExpected result: reject") - - # # 5: reject, user can't use from address "$user at sub.$domain" - # send_mail( envelope_from, envelope_to, - # subdom_header_from, header_to, 5, - # smtp_host = smtp_host, smtp_port = smtp_port, - # loginname = loginname, password = password, - # text = "Kolab filter testmail.\nExpected result: reject") - # Unauthenticated tests @@ -345,31 +317,6 @@ text = "Unauthenticated local env-sender, valid alias to local" + "Expected result: rewrite From") - # # 11: delivered, no mailer-daemon in kolabfilter log: - # # issue774 (null senders not handled by kolabfilter...) - # send_mail("<>", envelope_to, "some at non-existing.invalid", header_to, 11, - # smtp_host = smtp_host, smtp_port = smtp_port, - # text = "Kolab filter testmail.\nExpected result: delivery") - - # # 12: delivered, no Invalid From: header in postfix log: - # # issue783 (envelope header from check has problems with mailinglists) - # send_mail("x-commits-bounces-+y=malinglist.org at example.org", envelope_to, - # header_from, header_to, 12, - # smtp_host = smtp_host, smtp_port = smtp_port, - # text = "Kolab filter testmail.\nExpected result: delivery, from header rewritten") - - # # 12.1: delivered, no Invalid From: header in postfix log: - # send_mail("blah at example.org", envelope_to, - # "\"\\\\blah\\\"\" ", header_to, 12.1, - # smtp_host = smtp_host, smtp_port = smtp_port, - # text = "Kolab filter testmail.\nExpected result: delivery, from header rewritten") - - # # 13: if( verify_subdomains) rewrite, user can't use from header "$user at sub.$domain" - # # 13: if( !verify_subdomains) delivered - # send_mail( "someone at non-existing.invalid", envelope_to, - # subdom_header_from, header_to, 13, - # smtp_host = smtp_host, smtp_port = smtp_port, - # text = "Kolab filter testmail.\nExpected result: if( verify_subdomains) from header rewritten, else delivered") if __name__=="__main__": main(sys.argv) From cvs at kolab.org Tue Jul 6 22:40:38 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 6 Jul 2010 22:40:38 +0200 (CEST) Subject: gunnar: server/pear/PEAR-PHPUnit-Channel ChangeLog, 1.4, 1.5 PEAR-PHPUnit-Channel.spec, 1.6, 1.7 Message-ID: <20100706204038.7F9FC600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-PHPUnit-Channel In directory doto:/tmp/cvs-serv31713/d/PEAR-PHPUnit-Channel Modified Files: ChangeLog PEAR-PHPUnit-Channel.spec Log Message: kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on solaris 10) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/pear/PEAR-PHPUnit-Channel/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ChangeLog 19 Jan 2009 16:35:53 -0000 1.4 +++ ChangeLog 6 Jul 2010 20:40:36 -0000 1.5 @@ -1,3 +1,10 @@ +2010-07-06 Gunnar Wrobel
+ + * PEAR-PHPUnit-Channel.spec: + + kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on + solaris 10) + 2009-01-19 Thomas Arendsen Hein * Makefile: Fix build after kolab/issue3315. Index: PEAR-PHPUnit-Channel.spec =================================================================== RCS file: /kolabrepository/server/pear/PEAR-PHPUnit-Channel/PEAR-PHPUnit-Channel.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- PEAR-PHPUnit-Channel.spec 19 Jan 2009 16:35:53 -0000 1.6 +++ PEAR-PHPUnit-Channel.spec 6 Jul 2010 20:40:36 -0000 1.7 @@ -2,7 +2,7 @@ Name: PEAR-PHPUnit-Channel Version: 1.0 -Release: 20090119 +Release: 20100706 Summary: Adds pear.phpunit.de channel to PEAR Group: Development/Languages @@ -30,7 +30,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} -install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir} +%{l_prefix}/lib/openpkg/shtool install -c -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.phpunit.de.xml %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %clean From cvs at kolab.org Tue Jul 6 22:40:38 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 6 Jul 2010 22:40:38 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.560,1.561 Message-ID: <20100706204038.92010600564@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv31713 Modified Files: release-notes.txt Log Message: kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on solaris 10) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.560 retrieving revision 1.561 diff -u -d -r1.560 -r1.561 --- release-notes.txt 28 Jun 2010 13:50:22 -0000 1.560 +++ release-notes.txt 6 Jul 2010 20:40:36 -0000 1.561 @@ -227,6 +227,10 @@ kolab/issue3509 (calender not displaying in horde if german holidays are selected) + - PEAR-Horde-Channel-1.0-20090119 + + kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on solaris 10) + - PEAR-Mail-1.1.14-2 kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2) @@ -234,6 +238,10 @@ - PEAR-Mail_mimeDecode-1.5.0-2 kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2) + + - PEAR-PHPUnit-Channel-1.0-20090119 + + kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on solaris 10) - perl-kolab-2.?.?-2009???? From cvs at kolab.org Tue Jul 6 22:40:38 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 6 Jul 2010 22:40:38 +0200 (CEST) Subject: gunnar: server/pear/PEAR-Horde-Channel ChangeLog, 1.5, 1.6 PEAR-Horde-Channel.spec, 1.8, 1.9 Message-ID: <20100706204038.BA878600172@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/PEAR-Horde-Channel In directory doto:/tmp/cvs-serv31713/d/PEAR-Horde-Channel Modified Files: ChangeLog PEAR-Horde-Channel.spec Log Message: kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on solaris 10) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChangeLog 18 May 2009 17:34:04 -0000 1.5 +++ ChangeLog 6 Jul 2010 20:40:36 -0000 1.6 @@ -1,3 +1,10 @@ +2010-07-06 Gunnar Wrobel
+ + * PEAR-Horde-Channel.spec: + + kolab/issue3315 (PEAR-Horde-Channel-1.0 fails to compile on + solaris 10) + 2009-05-18 Gunnar Wrobel
* PEAR-Horde-Channel.spec: Prepare the channel installation for Index: PEAR-Horde-Channel.spec =================================================================== RCS file: /kolabrepository/server/pear/PEAR-Horde-Channel/PEAR-Horde-Channel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- PEAR-Horde-Channel.spec 18 May 2009 17:34:04 -0000 1.8 +++ PEAR-Horde-Channel.spec 6 Jul 2010 20:40:36 -0000 1.9 @@ -2,7 +2,7 @@ Name: PEAR-Horde-Channel Version: 1.0 -Release: 20090119 +Release: 20100706 Summary: Adds pear.horde.org channel to PEAR Group: Development/Languages @@ -32,7 +32,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} -install -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir} +%{l_prefix}/lib/openpkg/shtool install -c -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{pear_xmldir}/pear.horde.org.xml %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %clean From cvs at kolab.org Mon Jul 12 23:22:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 12 Jul 2010 23:22:11 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.561,1.562 Message-ID: <20100712212211.71AA4600167@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv26383 Modified Files: release-notes.txt Log Message: kolab/issue4430 (Modify User reply page contains user password in plain text) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.561 retrieving revision 1.562 diff -u -d -r1.561 -r1.562 --- release-notes.txt 6 Jul 2010 20:40:36 -0000 1.561 +++ release-notes.txt 12 Jul 2010 21:22:09 -0000 1.562 @@ -52,6 +52,8 @@ kolab/issue3401 (Change font color of the kolab-webadmin) kolab/issue3428 (Present the checkbox in the "accept internet email" nicer) + kolab/issue4430 ("Modify User" reply page contains user password + in plain text) - Kolab_Config-0.1.0-2010???? From cvs at kolab.org Mon Jul 12 23:22:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 12 Jul 2010 23:22:11 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.127,1.128 Message-ID: <20100712212211.72ADD600169@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv26383/kolab-webadmin/kolab-webadmin Modified Files: ChangeLog Log Message: kolab/issue4430 (Modify User reply page contains user password in plain text) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- ChangeLog 28 Jun 2010 13:50:22 -0000 1.127 +++ ChangeLog 12 Jul 2010 21:22:09 -0000 1.128 @@ -1,3 +1,13 @@ +2010-07-12 Gunnar Wrobel
+ + * www/admin/administrator/admin.php.in: + * www/admin/domainmaintainer/domainmaintainer.php.in: + * www/admin/maintainer/maintainer.php.in: + * www/admin/user/user.php.in: + + kolab/issue4430 ("Modify User" reply page contains user password + in plain text) + 2010-06-28 Gunnar Wrobel
* www/admin/user/user.php.in: From cvs at kolab.org Mon Jul 12 23:22:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 12 Jul 2010 23:22:11 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/administrator admin.php.in, 1.9, 1.10 Message-ID: <20100712212211.7E85E600560@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator In directory doto:/tmp/cvs-serv26383/kolab-webadmin/kolab-webadmin/www/admin/administrator Modified Files: admin.php.in Log Message: kolab/issue4430 (Modify User reply page contains user password in plain text) Index: admin.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- admin.php.in 11 Jan 2010 09:30:11 -0000 1.9 +++ admin.php.in 12 Jul 2010 21:22:09 -0000 1.10 @@ -243,6 +243,8 @@ $heading = _('Modify Administrator'); $messages[] = _('Administrator ').$ldap_object['dn']._(' successfully modified'); $form->setValues(); + $form->entries['password_0']['value'] = ''; + $form->entries['password_1']['value'] = ''; $form->entries['action']['value'] = 'save'; $content = $form->outputForm(); break; From cvs at kolab.org Mon Jul 12 23:22:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 12 Jul 2010 23:22:11 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.35, 1.36 Message-ID: <20100712212211.73C0860016E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv26383/kolab-webadmin/kolab-webadmin/php/admin/include Modified Files: form.class.php Log Message: kolab/issue4430 (Modify User reply page contains user password in plain text) Index: form.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- form.class.php 26 Mar 2010 11:15:07 -0000 1.35 +++ form.class.php 12 Jul 2010 21:22:09 -0000 1.36 @@ -394,7 +394,7 @@ if( strlen(trim($_REQUEST['user_'.$key])) == 0 ) { $this->errors[] = _('Required field ').$value['name']._(' is empty'); } - } else if( strlen( trim($_REQUEST[$key]) ) == 0 ) { + } else if( (!is_array($_REQUEST[$key]) && strlen( trim($_REQUEST[$key]) ) == 0) || empty($_REQUEST[$key]) ) { $this->errors[] = _('Required field ').$value['name']._(' is empty'); } } else { From cvs at kolab.org Mon Jul 12 23:22:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 12 Jul 2010 23:22:11 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer domainmaintainer.php.in, 1.16, 1.17 Message-ID: <20100712212211.8239E600578@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer In directory doto:/tmp/cvs-serv26383/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer Modified Files: domainmaintainer.php.in Log Message: kolab/issue4430 (Modify User reply page contains user password in plain text) Index: domainmaintainer.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- domainmaintainer.php.in 11 Jan 2010 09:30:11 -0000 1.16 +++ domainmaintainer.php.in 12 Jul 2010 21:22:09 -0000 1.17 @@ -243,6 +243,8 @@ $heading = _('Modify Domain Maintainer'); $messages[] = _('Maintainer ').$ldap_object['dn']._(' successfully modified'); $form->setValues(); + $form->entries['password_0']['value'] = ''; + $form->entries['password_1']['value'] = ''; if( $auth->group() != 'admin' && $auth->group() != 'maintainer' ) { $form->entries['firstname']['attrs'] = 'readonly'; $form->entries['lastname']['attrs'] = 'readonly'; From cvs at kolab.org Mon Jul 12 23:22:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 12 Jul 2010 23:22:11 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.32, 1.33 Message-ID: <20100712212211.8A6E260057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv26383/kolab-webadmin/kolab-webadmin/www/admin/user Modified Files: user.php.in Log Message: kolab/issue4430 (Modify User reply page contains user password in plain text) Index: user.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- user.php.in 28 Jun 2010 13:50:22 -0000 1.32 +++ user.php.in 12 Jul 2010 21:22:09 -0000 1.33 @@ -757,6 +757,8 @@ $heading = _('Modify User'); if( !$errors ) $messages[] = sprintf(_("User '%s' successfully modified"), $dn); $form->setValues(); + if(array_key_exists('password_0',$form->entries)) $form->entries['password_0']['value'] = ''; + if(array_key_exists('password_1',$form->entries)) $form->entries['password_1']['value'] = ''; $form->entries['mail']['attrs'] = 'readonly'; $form->entries['kolabhomeserver']['attrs'] = 'readonly'; $form->entries['action']['value'] = 'save'; From cvs at kolab.org Mon Jul 12 23:22:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 12 Jul 2010 23:22:11 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer maintainer.php.in, 1.11, 1.12 Message-ID: <20100712212211.85C2E600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer In directory doto:/tmp/cvs-serv26383/kolab-webadmin/kolab-webadmin/www/admin/maintainer Modified Files: maintainer.php.in Log Message: kolab/issue4430 (Modify User reply page contains user password in plain text) Index: maintainer.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- maintainer.php.in 11 Jan 2010 09:30:11 -0000 1.11 +++ maintainer.php.in 12 Jul 2010 21:22:09 -0000 1.12 @@ -240,6 +240,8 @@ $heading = _('Modify Maintainer'); $messages[] = _('Maintainer ').$ldap_object['dn']._(' successfully modified'); $form->setValues(); + $form->entries['password_0']['value'] = ''; + $form->entries['password_1']['value'] = ''; if( $auth->group() != 'admin' ) { $form->entries['firstname']['attrs'] = 'readonly'; $form->entries['lastname']['attrs'] = 'readonly'; From cvs at kolab.org Thu Jul 15 23:50:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 15 Jul 2010 23:50:57 +0200 (CEST) Subject: gunnar: server/pear/Kolab_Resource - New directory Message-ID: <20100715215057.2FBF5600161@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Kolab_Resource In directory doto:/tmp/cvs-serv24290/Kolab_Resource Log Message: Directory /kolabrepository/server/pear/Kolab_Resource added to the repository From cvs at kolab.org Thu Jul 15 23:52:51 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 15 Jul 2010 23:52:51 +0200 (CEST) Subject: gunnar: server/pear/Kolab_Resource .cvsignore, NONE, 1.1 ChangeLog, NONE, 1.1 Makefile, NONE, 1.1 package.info, NONE, 1.1 Message-ID: <20100715215251.8D861600161@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Kolab_Resource In directory doto:/tmp/cvs-serv24408 Added Files: .cvsignore ChangeLog Makefile package.info Log Message: Add the new Kolab_Resource package which has been extracted from Kolab_Filter. This includes the fix for kolab/issue4434 (Resource (Reject if conflicts) accepts recurring event even if second occurrence is busy) --- NEW FILE: .cvsignore --- *.src.rpm *.tgz *.spec package.patch tmp --- NEW FILE: ChangeLog --- 2010-07-14 Gunnar Wrobel
* package.info: Added package to Kolab CVS. --- NEW FILE: Makefile --- include ../../make-helper/pear.mk --- NEW FILE: package.info --- # The name of Horde source package pear_package='Kolab_Resource' # The name of the RPM package package='Kolab_Resource' # Where to find information about the package package_url='http://pear.horde.org/index.php?package=' # How should the source be retrieved? # # WGET: Download via wget package_origin='WGET' # Version number version='0.1.0' # Package release number release='20100714' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel' # In which PHP library location should the library get installed php_lib_loc='php' # Build prerequisites buildprereq=' \ BuildPreReq: OpenPKG, openpkg >= 20070603 \ BuildPreReq: php, php::with_pear = yes \ BuildPreReq: PEAR-Horde-Channel \ ' # Installatin prerequisites prereq=' \ PreReq: OpenPKG, openpkg >= 20070603 \ PreReq: php, php::with_pear = yes \ PreReq: PEAR-Horde-Channel \ PreReq: Kolab_Format >= 1.0.1 \ PreReq: Kolab_Storage >= 0.4.0 \ PreReq: PEAR-HTTP_Request \ PreReq: Horde_iCalendar \ PreReq: Horde_MIME \ PreReq: Horde_Framework \ PreReq: Horde_Util \ ' # Package summary description summary='Resource management for the Kolab server' # Long package description description=' \ This package allows booking of Kolab server resources. \ ' # Source code license license='LGPL' From cvs at kolab.org Thu Jul 15 23:54:20 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 15 Jul 2010 23:54:20 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.562,1.563 Message-ID: <20100715215420.5ADCE600161@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv24459 Modified Files: release-notes.txt Log Message: Update release notes for kolab/issue4434 (Resource (Reject if conflicts) accepts recurring event even if second occurrence is busy) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.562 retrieving revision 1.563 diff -u -d -r1.562 -r1.563 --- release-notes.txt 12 Jul 2010 21:22:09 -0000 1.562 +++ release-notes.txt 15 Jul 2010 21:54:18 -0000 1.563 @@ -115,6 +115,11 @@ kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder) + - Kolab_Resource-0.1.0-2010???? + + kolab/issue4434 (Resource (Reject if conflicts) accepts + recurring event even if second occurrence is busy) + - Kolab_Server-0.5.0-2010???? Support configurable attribute mapping. From cvs at kolab.org Thu Jul 15 23:57:25 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 15 Jul 2010 23:57:25 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.563,1.564 Message-ID: <20100715215725.BD7EB600161@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv24538 Modified Files: release-notes.txt Log Message: Use the new Kolab_Resource. Improved logging. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.563 retrieving revision 1.564 diff -u -d -r1.563 -r1.564 --- release-notes.txt 15 Jul 2010 21:54:18 -0000 1.563 +++ release-notes.txt 15 Jul 2010 21:57:23 -0000 1.564 @@ -68,6 +68,10 @@ Added french translation. Submitted by Mathieu Parent (mathieuparent at users.sourceforge.net). + Use the new Kolab_Resource package. + + Improved (reduced) logging. + kolab/issue1336 (Resource booking fails, if TRANSP:TRANSPARENT in the invitation) kolab/issue1382 (resmgr accepts concurrent overlapping invitations) From cvs at kolab.org Thu Jul 15 23:57:25 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 15 Jul 2010 23:57:25 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.35, 1.36 Kolab_Filter.spec, 1.30, 1.31 package.info, 1.4, 1.5 Message-ID: <20100715215725.C5ECF600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter In directory doto:/tmp/cvs-serv24538/d/Kolab_Filter Modified Files: ChangeLog Kolab_Filter.spec package.info Log Message: Use the new Kolab_Resource. Improved logging. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- ChangeLog 20 Apr 2010 04:53:56 -0000 1.35 +++ ChangeLog 15 Jul 2010 21:57:23 -0000 1.36 @@ -1,3 +1,10 @@ +2010-07-15 root + + * package.info: Update to 0.1.10. + + Use the new Kolab_Resource package. + Improved (reduced) logging. + 2010-04-20 Gunnar Wrobel
* Kolab_Filter.spec: Update to 0.1.9. Index: Kolab_Filter.spec =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- Kolab_Filter.spec 20 Apr 2010 04:53:56 -0000 1.30 +++ Kolab_Filter.spec 15 Jul 2010 21:57:23 -0000 1.31 @@ -6,8 +6,8 @@ %define V_package_origin WGET %define V_repo_commit %define V_repo_release -%define V_version 0.1.9 -%define V_release 20100420 +%define V_version 0.1.10 +%define V_release 20100715 %define V_sourceurl http://pear.horde.org/get %define V_php_lib_loc php %define V_www_loc @@ -106,6 +106,7 @@ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-filter/tmp \ + %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-filter/locks \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-filter/log %clean Index: package.info =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/package.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- package.info 20 Apr 2010 04:53:56 -0000 1.4 +++ package.info 15 Jul 2010 21:57:23 -0000 1.5 @@ -13,10 +13,10 @@ package_origin='WGET' # Version number -version='0.1.9' +version='0.1.10' # Package release number -release='20100420' +release='20100715' # Source URL to download from sourceurl='http://pear.horde.org/get' @@ -39,6 +39,7 @@ 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 \ From cvs at kolab.org Fri Jul 16 00:01:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 16 Jul 2010 00:01:28 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd ChangeLog,1.297,1.298 Message-ID: <20100715220128.2E70C60057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv24746/d/kolabd Modified Files: ChangeLog Log Message: Reduced amount of logging in the Kolab_Filter package. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.297 retrieving revision 1.298 diff -u -d -r1.297 -r1.298 --- ChangeLog 17 Jun 2010 18:48:58 -0000 1.297 +++ ChangeLog 15 Jul 2010 22:01:26 -0000 1.298 @@ -1,3 +1,9 @@ +2010-07-15 Gunnar Wrobel
+ + * templates/resmgr.conf.template.in: + + Reduced amount of logging in the Kolab_Filter package. + 2010-06-17 Mathieu Parent * dist_conf/debian: Cyrus user and group is cyrus:mail on Debian From cvs at kolab.org Fri Jul 16 00:01:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 16 Jul 2010 00:01:28 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.564,1.565 Message-ID: <20100715220128.268E660057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv24746 Modified Files: release-notes.txt Log Message: Reduced amount of logging in the Kolab_Filter package. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.564 retrieving revision 1.565 diff -u -d -r1.564 -r1.565 --- release-notes.txt 15 Jul 2010 21:57:23 -0000 1.564 +++ release-notes.txt 15 Jul 2010 22:01:26 -0000 1.565 @@ -168,6 +168,8 @@ Support a hooks directory that allows to extend the deletion of users. + Reduced amount of logging in the Kolab_Filter package. + kolab/issue1382 (resmgr accepts concurrent overlapping invitations) kolab/issue1671 (Improving the warning about kolab templates within configuration files) From cvs at kolab.org Fri Jul 16 00:01:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 16 Jul 2010 00:01:28 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.41, 1.42 Message-ID: <20100715220128.2FF1060057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv24746/d/kolabd/templates Modified Files: resmgr.conf.template.in Log Message: Reduced amount of logging in the Kolab_Filter package. Index: resmgr.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- resmgr.conf.template.in 15 Apr 2010 14:45:38 -0000 1.41 +++ resmgr.conf.template.in 15 Jul 2010 22:01:26 -0000 1.42 @@ -217,6 +217,7 @@ /* Do not record login attempts */ $conf['auth']['params']['login_block'] = false; +$conf['umask'] = false; /* Set some configuration values for Horde_Secret:: */ $conf['session']['timeout'] = 0; @@ -230,7 +231,7 @@ * your mails in the filters. */ $conf['log']['enabled'] = true; -$conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package... +$conf['log']['priority'] = PEAR_LOG_INFO; // Leave this on DEBUG for now. We just restructured the package... $conf['log']['type'] = '@resmgr_log_type@'; $conf['log']['name'] = '@resmgr_log_name@'; //$conf['log']['name'] = '@resmgr_log_name at .'.getmypid(); From cvs at kolab.org Fri Jul 16 21:14:33 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 16 Jul 2010 21:14:33 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Filter package.info,1.5,1.6 Message-ID: <20100716191433.C18F6600583@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter In directory doto:/tmp/cvs-serv31735 Modified Files: package.info Log Message: Fix source download location. Index: package.info =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/package.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- package.info 15 Jul 2010 21:57:23 -0000 1.5 +++ package.info 16 Jul 2010 19:14:31 -0000 1.6 @@ -19,7 +19,7 @@ release='20100715' # Source URL to download from -sourceurl='http://pear.horde.org/get' +sourceurl='http://files.kolab.org/incoming/wrobel' # In which PHP library location should the library get installed php_lib_loc='php' From cvs at kolab.org Fri Jul 16 22:49:23 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 16 Jul 2010 22:49:23 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.25, NONE Message-ID: <20100716204923.19F35600587@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv1721/kolabd/templates Removed Files: freebusy.conf.template.in Log Message: This is available from the Kolab_FreeBusy package. --- freebusy.conf.template.in DELETED --- From cvs at kolab.org Fri Jul 16 22:59:23 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 16 Jul 2010 22:59:23 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7 freebusy.conf.template, 1.1, 1.2 Message-ID: <20100716205923.79450600589@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7 In directory doto:/tmp/cvs-serv1972/templates/Kolab_FreeBusy-0.1.7 Modified Files: freebusy.conf.template Log Message: Reduce log output. Index: freebusy.conf.template =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7/freebusy.conf.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- freebusy.conf.template 22 Jun 2010 23:29:47 -0000 1.1 +++ freebusy.conf.template 16 Jul 2010 20:59:21 -0000 1.2 @@ -44,7 +44,7 @@ /* Horde::Log configuration */ $conf['log']['enabled'] = true; -$conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package... +$conf['log']['priority'] = PEAR_LOG_INFO; $conf['log']['type'] = '@@@freebusy_log_type@@@'; $conf['log']['name'] = '@@@freebusy_log_name@@@'; $conf['log']['ident'] = 'Kolab Free/Busy'; @@ -104,6 +104,7 @@ $conf['auth']['params']['login_block'] = 0; $conf['auth']['checkbrowser'] = false; $conf['auth']['checkip'] = false; +$conf['umask'] = false; /* Allow special users to log into the system */ $conf['kolab']['imap']['allow_special_users'] = true; From cvs at kolab.org Fri Jul 16 22:59:23 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 16 Jul 2010 22:59:23 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Freebusy Kolab_FreeBusy.spec, 1.31, 1.32 package.info, 1.8, 1.9 Message-ID: <20100716205923.75E7E600587@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy In directory doto:/tmp/cvs-serv1972 Modified Files: Kolab_FreeBusy.spec package.info Log Message: Reduce log output. Index: Kolab_FreeBusy.spec =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- Kolab_FreeBusy.spec 25 Jun 2010 08:38:18 -0000 1.31 +++ Kolab_FreeBusy.spec 16 Jul 2010 20:59:21 -0000 1.32 @@ -7,7 +7,7 @@ %define V_repo_commit %define V_repo_release %define V_version 0.1.7 -%define V_release 20100625 +%define V_release 20100716 %define V_sourceurl http://pear.horde.org/get %define V_php_lib_loc php %define V_www_loc freebusy Index: package.info =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/package.info,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- package.info 25 Jun 2010 08:38:18 -0000 1.8 +++ package.info 16 Jul 2010 20:59:21 -0000 1.9 @@ -16,7 +16,7 @@ version='0.1.7' # Package release number -release='20100625' +release='20100716' # Source URL to download from sourceurl='http://pear.horde.org/get' From cvs at kolab.org Sat Jul 17 15:43:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 17 Jul 2010 15:43:11 +0200 (CEST) Subject: gunnar: server/perl-kolab perl-kolab.spec,1.118,1.119 Message-ID: <20100717134311.669CA600583@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv32746/perl-kolab Modified Files: perl-kolab.spec Log Message: kolab/issue977 (Kolab suppresses ldap error messages) kolab/issue978 (incorrect ->abandon; call) Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- perl-kolab.spec 28 Jun 2010 09:04:25 -0000 1.118 +++ perl-kolab.spec 17 Jul 2010 13:43:09 -0000 1.119 @@ -26,7 +26,7 @@ # versions of individual parts %define V_perl 5.8.8 %define V_package perl-kolab -%define V_version 2.2.3+cvs20100628 +%define V_version 2.2.3+cvs20100717 %define V_release 1 # package information From cvs at kolab.org Sat Jul 17 15:43:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 17 Jul 2010 15:43:11 +0200 (CEST) Subject: gunnar: server/perl-kolab/perl-kolab/lib/Kolab LDAP.pm,1.6,1.7 Message-ID: <20100717134311.7C1BF60058B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab/perl-kolab/lib/Kolab In directory doto:/tmp/cvs-serv32746/perl-kolab/perl-kolab/lib/Kolab Modified Files: LDAP.pm Log Message: kolab/issue977 (Kolab suppresses ldap error messages) kolab/issue978 (incorrect ->abandon; call) Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab/lib/Kolab/LDAP.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- LDAP.pm 28 Jun 2010 08:54:22 -0000 1.6 +++ LDAP.pm 17 Jul 2010 13:43:09 -0000 1.7 @@ -321,7 +321,7 @@ timeout => 20, async => $as, verify => 'none', - onerror => 'undef' + onerror => \&ldap_error ); } else { $ldap = Net::LDAP->new( @@ -330,7 +330,7 @@ version => 3, timeout => 20, async => $as, - onerror => 'undef' + onerror => \&ldap_error ); } if (!$ldap) { @@ -356,7 +356,6 @@ my $ldap = shift; if (defined($ldap) && ($ldap->isa('Net::LDAP') || $ldap->isa('Net::LDAPS'))) { - $ldap->abandon; $ldap->unbind; $ldap->disconnect; } @@ -1007,6 +1006,14 @@ my @tab = ('.', '/', 0 .. 9, 'A' .. 'Z', 'a' .. 'z'); return join "", @tab[ map {rand 64} (1 .. $length) ]; +} + +sub ldap_error { + my $mesg = shift; + my $errstr = $mesg->dn || ''; + $errstr .= ": " if $errstr; + $errstr .= $mesg->error if $mesg->error; + Kolab::log('L', $errstr, KOLAB_ERROR); } From cvs at kolab.org Sat Jul 17 15:43:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 17 Jul 2010 15:43:11 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.565,1.566 Message-ID: <20100717134311.62DAA600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv32746 Modified Files: release-notes.txt Log Message: kolab/issue977 (Kolab suppresses ldap error messages) kolab/issue978 (incorrect ->abandon; call) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.565 retrieving revision 1.566 diff -u -d -r1.565 -r1.566 --- release-notes.txt 15 Jul 2010 22:01:26 -0000 1.565 +++ release-notes.txt 17 Jul 2010 13:43:09 -0000 1.566 @@ -280,6 +280,8 @@ kolab/issue919 (kolab server has problems with some characters in passwords (rt#5558)) + kolab/issue977 (Kolab suppresses ldap error messages) + kolab/issue978 (incorrect $ldap->abandon; call) kolab/issue1679 (Update template META mechanism to support service restarts) kolab/issue3472 (web client user prefs not deleted when user gets From cvs at kolab.org Sat Jul 17 15:43:11 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 17 Jul 2010 15:43:11 +0200 (CEST) Subject: gunnar: server/perl-kolab/perl-kolab ChangeLog,1.8,1.9 Message-ID: <20100717134311.61931600168@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/perl-kolab/perl-kolab In directory doto:/tmp/cvs-serv32746/perl-kolab/perl-kolab Modified Files: ChangeLog Log Message: kolab/issue977 (Kolab suppresses ldap error messages) kolab/issue978 (incorrect ->abandon; call) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChangeLog 28 Jun 2010 09:04:25 -0000 1.8 +++ ChangeLog 17 Jul 2010 13:43:09 -0000 1.9 @@ -1,3 +1,10 @@ +2010-07-17 Gunnar Wrobel
+ + * lib/Kolab/LDAP.pm: + + kolab/issue977 (Kolab suppresses ldap error messages) + kolab/issue978 (incorrect $ldap->abandon; call) + 2010-06-28 Gunnar Wrobel
* lib/Kolab/LDAP.pm: From cvs at kolab.org Sat Jul 17 15:59:16 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 17 Jul 2010 15:59:16 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd/templates slapd.conf.template.in, 1.31, 1.32 Message-ID: <20100717135916.7E1F7600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv650/templates Modified Files: slapd.conf.template.in Log Message: kolab/issue3245 (Remove horde.schema and rfc2739.schema from kolab-server/slapd.conf.template) Index: slapd.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- slapd.conf.template.in 17 Jan 2010 10:20:19 -0000 1.31 +++ slapd.conf.template.in 17 Jul 2010 13:59:14 -0000 1.32 @@ -26,8 +26,22 @@ include @ldapserver_schemadir@/core.schema include @ldapserver_schemadir@/cosine.schema include @ldapserver_schemadir@/inetorgperson.schema -include @ldapserver_schemadir@/rfc2739.schema include @ldapserver_schemadir@/kolab2.schema + +# Only include this in case you need the calFBURL attribute in +# kolabInetOrgPerson objects. +# see also kolab/issue3245 (https://issues.kolab.org/issue3245) +# +# The schema remains available at +# /kolab/var/kolab/www/client/turba/scripts/ldap/rfc2739.schema +#include @ldapserver_schemadir@/rfc2739.schema + +# Only include this in case you want to store the preferences of the +# kolab web client in LDAP. +# see also kolab/issue3245 (https://issues.kolab.org/issue3245) +# +# The schema remains available at +# /kolab/var/kolab/www/client/scripts/ldap/horde.schema #include @ldapserver_schemadir@/horde.schema pidfile @ldapserver_pidfile@ From cvs at kolab.org Sat Jul 17 15:59:16 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 17 Jul 2010 15:59:16 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.298, 1.299 kolab2.schema, 1.38, 1.39 horde.schema, 1.2, NONE rfc2739.schema, 1.2, NONE Message-ID: <20100717135916.79767600168@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv650 Modified Files: ChangeLog kolab2.schema Removed Files: horde.schema rfc2739.schema Log Message: kolab/issue3245 (Remove horde.schema and rfc2739.schema from kolab-server/slapd.conf.template) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.298 retrieving revision 1.299 diff -u -d -r1.298 -r1.299 --- ChangeLog 15 Jul 2010 22:01:26 -0000 1.298 +++ ChangeLog 17 Jul 2010 13:59:14 -0000 1.299 @@ -1,3 +1,10 @@ +2010-07-17 Gunnar Wrobel
+ + * kolab2.schema, horde.schema, rfc2739.schema: + + kolab/issue3245 (Remove horde.schema and rfc2739.schema from + kolab-server/slapd.conf.template) + 2010-07-15 Gunnar Wrobel
* templates/resmgr.conf.template.in: Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- kolab2.schema 8 Jul 2009 10:26:06 -0000 1.38 +++ kolab2.schema 17 Jul 2010 13:59:14 -0000 1.39 @@ -1008,7 +1008,6 @@ cyrus-userquota $ kolabInvitationPolicy $ kolabFreeBusyFuture $ - calFBURL $ kolabVacationBeginDateTime $ kolabVacationEndDateTime $ kolabVacationResendInterval $ --- horde.schema DELETED --- --- rfc2739.schema DELETED --- From cvs at kolab.org Sat Jul 17 15:59:29 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 17 Jul 2010 15:59:29 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.566,1.567 Message-ID: <20100717135929.D1556600168@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv717 Modified Files: release-notes.txt Log Message: kolab/issue3245 (Remove horde.schema and rfc2739.schema from kolab-server/slapd.conf.template) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.566 retrieving revision 1.567 diff -u -d -r1.566 -r1.567 --- release-notes.txt 17 Jul 2010 13:43:09 -0000 1.566 +++ release-notes.txt 17 Jul 2010 13:59:27 -0000 1.567 @@ -180,6 +180,8 @@ kolab/issue1755 (syncrepl support (for OpenLDAP >=2.4.6)) kolab/issue2499 (Notification messages by the resource manager sould be localized) + kolab/issue3245 (Remove horde.schema and rfc2739.schema from + kolab-server/slapd.conf.template) kolab/issue3472 (web client user prefs not deleted when user gets deleted) kolab/issue3490 (Please include dist_conf/kolabsrv.in in source From cvs at kolab.org Sat Jul 17 16:05:02 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 17 Jul 2010 16:05:02 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd Makefile.am,1.57,1.58 Message-ID: <20100717140502.8E713600168@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv1287 Modified Files: Makefile.am Log Message: kolab/issue3245 (Remove horde.schema and rfc2739.schema from kolab-server/slapd.conf.template) Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- Makefile.am 27 Jun 2010 07:04:40 -0000 1.57 +++ Makefile.am 17 Jul 2010 14:05:00 -0000 1.58 @@ -80,9 +80,7 @@ kolabnamespace_DATA = $(kolabnamespace_FILES) -ldapschema_FILES = kolab2.schema \ - horde.schema \ - rfc2739.schema +ldapschema_FILES = kolab2.schema ldapschemadir = $(ldapserver_schemadir) dist_ldapschema_DATA = $(ldapschema_FILES) From cvs at kolab.org Sat Jul 17 16:51:18 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 17 Jul 2010 16:51:18 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.567,1.568 Message-ID: <20100717145118.7F1EA600168@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv2704 Modified Files: release-notes.txt Log Message: kolab/issue1072 (postfix logs readable for everyone) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.567 retrieving revision 1.568 diff -u -d -r1.567 -r1.568 --- release-notes.txt 17 Jul 2010 13:59:27 -0000 1.567 +++ release-notes.txt 17 Jul 2010 14:51:16 -0000 1.568 @@ -303,6 +303,10 @@ Added support for PDO sqlite3. + - postfix-2.4.6-20080101_kolab2 + + kolab/issue1072 (postfix logs readable for everyone) + - turba-2.3.3-2010???? Support setting Zpush configuration values. From cvs at kolab.org Sat Jul 17 16:51:18 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 17 Jul 2010 16:51:18 +0200 (CEST) Subject: gunnar: server/postfix Makefile,1.21,1.22 kolab.patch,1.7,1.8 Message-ID: <20100717145118.82517600170@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/postfix In directory doto:/tmp/cvs-serv2704/postfix Modified Files: Makefile kolab.patch Log Message: kolab/issue1072 (postfix logs readable for everyone) Index: Makefile =================================================================== RCS file: /kolabrepository/server/postfix/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Makefile 17 Jan 2010 13:22:55 -0000 1.21 +++ Makefile 17 Jul 2010 14:51:16 -0000 1.22 @@ -4,7 +4,7 @@ DOWNLOAD_VERSION=2.4.6 OPENPKG_RELEASE=20080101 VERSION=2.4.6 -RELEASE=20080101_kolab +RELEASE=20080101_kolab2 SOURCE_URL= SOURCE_0= Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/postfix/kolab.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- kolab.patch 2 May 2008 10:26:39 -0000 1.7 +++ kolab.patch 17 Jul 2010 14:51:16 -0000 1.8 @@ -5,7 +5,7 @@ License: IPL Version: %{V_postfix} -Release: 20080101 -+Release: 20080101_kolab ++Release: 20080101_kolab2 # package options %option with_fsl yes @@ -19,3 +19,14 @@ %endif %if "%{with_ssl}" == "yes" CCARGS="$CCARGS -DUSE_TLS" +--- fsl.postfix.orig 2010-07-17 16:24:41.000000000 +0200 ++++ fsl.postfix 2010-07-17 16:25:29.000000000 +0200 +@@ -9,7 +9,7 @@ + -> { + debug: file( + path="@l_prefix@/var/postfix/log/postfix.log", +- perm=0644, monitor=3600 ++ perm=0640, monitor=3600 + ) + } + }; From cvs at kolab.org Sun Jul 18 21:51:35 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 18 Jul 2010 21:51:35 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.42, 1.43 Message-ID: <20100718195135.8640560015D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv3199/kolabd/kolabd/templates Modified Files: resmgr.conf.template.in Log Message: Remove useless comment as pointed out by Mathieu Index: resmgr.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- resmgr.conf.template.in 15 Jul 2010 22:01:26 -0000 1.42 +++ resmgr.conf.template.in 18 Jul 2010 19:51:33 -0000 1.43 @@ -231,7 +231,7 @@ * your mails in the filters. */ $conf['log']['enabled'] = true; -$conf['log']['priority'] = PEAR_LOG_INFO; // Leave this on DEBUG for now. We just restructured the package... +$conf['log']['priority'] = PEAR_LOG_INFO; $conf['log']['type'] = '@resmgr_log_type@'; $conf['log']['name'] = '@resmgr_log_name@'; //$conf['log']['name'] = '@resmgr_log_name at .'.getmypid(); From cvs at kolab.org Wed Jul 21 19:40:33 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 Jul 2010 19:40:33 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Filter/templates - New directory Message-ID: <20100721174033.38A1560014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter/templates In directory doto:/tmp/cvs-serv5938/Kolab_Filter/templates Log Message: Directory /kolabrepository/server/php-kolab/Kolab_Filter/templates added to the repository From cvs at kolab.org Wed Jul 21 19:40:42 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 Jul 2010 19:40:42 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Filter/templates/Kolab_Filter-0.1.10 - New directory Message-ID: <20100721174042.4739360014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter/templates/Kolab_Filter-0.1.10 In directory doto:/tmp/cvs-serv5974/Kolab_Filter/templates/Kolab_Filter-0.1.10 Log Message: Directory /kolabrepository/server/php-kolab/Kolab_Filter/templates/Kolab_Filter-0.1.10 added to the repository From cvs at kolab.org Wed Jul 21 19:44:01 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 Jul 2010 19:44:01 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Filter/templates/Kolab_Filter-0.1.10 filter.conf.template, NONE, 1.1 rc.filter.template, NONE, 1.1 Message-ID: <20100721174401.9E64360015A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter/templates/Kolab_Filter-0.1.10 In directory doto:/tmp/cvs-serv6055/Kolab_Filter/templates/Kolab_Filter-0.1.10 Added Files: filter.conf.template rc.filter.template Log Message: kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs. --- NEW FILE: filter.conf.template --- KOLAB_META_START TARGET=@@@resmgr_confdir@@@/kolabfilter.conf PERMISSIONS=0640 OWNERSHIP=@@@resmgr_conffile_usr@@@:@@@resmgr_conffile_grp@@@ KOLAB_META_END is not authenticated)'; /* Should we allow forwarded ical messages from Outlook * by encapsulating them in a MIME multipart */ $conf['kolab']['filter']['allow_outlook_ical_forward'] = true; /* What is the address of the LDAP server address where user objects * reside */ $conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@'; /* What is the Base DN of our LDAP database? */ $conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@'; /* What DN should we use to bind to the LDAP server? */ $conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@'; /* What password should we use with the above DN when binding? */ $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@'; /** * If you use customized LDAP attributes on your LDAP server the * following configuration setting allows you to map the standard * Kolab attribute names to your customizations. * * Specify the mapping line by line: * * $conf['kolab']['ldap']['map']['uid'] = 'uid2'; * $conf['kolab']['ldap']['map']['mobile'] = 'handy'; * * or use a hash structure: * * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2', * 'mobile' => 'handy'); * */ //$conf['kolab']['ldap']['map']['uid'] = 'uid2'; /** * If you use customized LDAP attributes on your LDAP server the * following configuration setting allows you to map the standard * Kolab attribute names to your customizations. * * Specify the mapping line by line: * * $conf['kolab']['ldap']['map']['uid'] = 'uid2'; * $conf['kolab']['ldap']['map']['mobile'] = 'handy'; * * or use a hash structure: * * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2', * 'mobile' => 'handy'); * */ //$conf['kolab']['ldap']['map']['uid'] = 'uid2'; /* What account should we use to read/write calendar data? This * account should have access to the calendar mailbox of all * resource/group mailboxes. */ $conf['kolab']['filter']['calendar_id'] = '@@@calendar_id@@@'; $conf['kolab']['filter']['calendar_pass'] = '@@@calendar_pw@@@'; /* What is the name of the users' calendar mailbox? This is only used * when the user does not already have a primary calendar folder * (search via Kolab annotation) */ $conf['kolab']['filter']['calendar_store'] = 'Calendar'; /* Where can we get free/busy information from? */ $conf['kolab']['freebusy']['server'] = 'https://@@@fqdnhostname@@@/freebusy'; /* Temporary data storage for the scripts */ $conf['kolab']['filter']['tempdir'] = '@@@resmgr_tmpdir@@@'; /* Uncomment if the resource manager should generate translated messages. */ //$conf['kolab']['filter']['locale_path'] = '@@@resmgr_localedir@@@'; //$conf['kolab']['filter']['locale'] = 'de_DE'; /* Use locking for the resource manager? */ $conf['kolab']['filter']['simple_locks'] = true; /* Timeout for the locks */ $conf['kolab']['filter']['simple_locks_timeout'] = 60; /* Directory for storing the locks */ $conf['kolab']['filter']['simple_locks_dir'] = '@@@resmgr_locksdir@@@'; /* PHP error logging */ $conf['kolab']['filter']['error_log'] = '@@@resmgr_logdir@@@/fatal.log'; /* Allow special users to log into the system */ $conf['kolab']['imap']['allow_special_users'] = true; /* Do not record login attempts */ $conf['auth']['params']['login_block'] = false; $conf['umask'] = false; /* Set some configuration values for Horde_Secret:: */ $conf['session']['timeout'] = 0; $conf['cookie']['path'] = '/'; $conf['cookie']['domain'] = '@@@postfix-mydomain@@@'; $conf['use_ssl'] = 0; /* Horde::Log configuration * * PEAR_LOG_INFO is the suggested setting for tracking what happens to * your mails in the filters. */ $conf['log']['enabled'] = true; $conf['log']['priority'] = PEAR_LOG_INFO; $conf['log']['type'] = '@@@resmgr_log_type@@@'; $conf['log']['name'] = '@@@resmgr_log_name@@@'; //$conf['log']['name'] = '@@@resmgr_log_name@@@.'.getmypid(); $conf['log']['ident'] = 'Kolab Filter (pid='.getmypid().')'; $conf['log']['params']['append'] = true; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // // If you modify this file, please do not forget to ping upstream // about synchronizing this file with // // FIXME: The upstream reference point is currently missing! // //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ?> --- NEW FILE: rc.filter.template --- KOLAB_META_START TARGET=@@@sysconfdir@@@/rc.d/rc.filter PERMISSIONS=0755 OWNERSHIP=@@@kolab_musr@@@:@@@kolab_mgrp@@@ KOLAB_META_END #!@@@KOLABRC@@@ rc ## ## rc.filter -- Handles log rotation for the Kolab Postfix filters. ## @@@warning@@@ %config filter_log_logfile="@@@resmgr_logdir@@@/filter.log" filter_log_phperrors="@@@resmgr_logdir@@@/fatal.log" filter_log_owner="@@@kolab_usr@@@" filter_log_group="@@@kolab_grp@@@" filter_log_prolog="true" filter_log_epilog="true" filter_log_numfiles="10" filter_log_minsize="1M" filter_log_complevel="9" %daily -u @@@kolab_susr@@@ shtool rotate -f \ -n ${filter_log_numfiles} -s ${filter_log_minsize} -d \ -z ${filter_log_complevel} -m 640 \ -o ${filter_log_owner} \ -g ${filter_log_group} \ -P "${filter_log_prolog}" \ -E "${filter_log_epilog}" \ "${filter_log_logfile}" shtool rotate -f \ -n ${filter_log_numfiles} -s ${filter_log_minsize} -d \ -z ${filter_log_complevel} -m 640 \ -o ${filter_log_owner} \ -g ${filter_log_group} \ -P "${filter_log_prolog}" \ -E "${filter_log_epilog}" \ "${filter_log_phperrors}" From cvs at kolab.org Wed Jul 21 19:44:01 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 Jul 2010 19:44:01 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7 rc.freebusy.template, NONE, 1.1 Message-ID: <20100721174401.AE056600161@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7 In directory doto:/tmp/cvs-serv6055/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7 Added Files: rc.freebusy.template Log Message: kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs. --- NEW FILE: rc.freebusy.template --- KOLAB_META_START TARGET=@@@sysconfdir@@@/rc.d/rc.freebusy PERMISSIONS=0755 OWNERSHIP=@@@kolab_musr@@@:@@@kolab_mgrp@@@ KOLAB_META_END #!@@@KOLABRC@@@ rc ## ## rc.freebusy -- Handles log rotation for the free/busy system. ## @@@warning@@@ %config freebusy_log_logfile="@@@freebusy_log_name@@@" freebusy_log_phperrors="@@@freebusy_logdir@@@/php-error.log" freebusy_log_owner="@@@kolab_usr@@@" freebusy_log_group="@@@kolab_grp@@@" freebusy_log_prolog="true" freebusy_log_epilog="true" freebusy_log_numfiles="10" freebusy_log_minsize="1M" freebusy_log_complevel="9" %daily -u @@@kolab_susr@@@ shtool rotate -f \ -n ${freebusy_log_numfiles} -s ${freebusy_log_minsize} -d \ -z ${freebusy_log_complevel} -m 640 \ -o ${freebusy_log_owner} \ -g ${freebusy_log_group} \ -P "${freebusy_log_prolog}" \ -E "${freebusy_log_epilog}" \ "${freebusy_log_logfile}" shtool rotate -f \ -n ${freebusy_log_numfiles} -s ${freebusy_log_minsize} -d \ -z ${freebusy_log_complevel} -m 640 \ -o ${freebusy_log_owner} \ -g ${freebusy_log_group} \ -P "${freebusy_log_prolog}" \ -E "${freebusy_log_epilog}" \ "${freebusy_log_phperrors}" From cvs at kolab.org Wed Jul 21 19:44:01 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 Jul 2010 19:44:01 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.36, 1.37 Kolab_Filter.spec, 1.31, 1.32 Makefile, 1.13, 1.14 package.info, 1.6, 1.7 Message-ID: <20100721174401.9ACA360014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Filter In directory doto:/tmp/cvs-serv6055/Kolab_Filter Modified Files: ChangeLog Kolab_Filter.spec Makefile package.info Log Message: kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- ChangeLog 15 Jul 2010 21:57:23 -0000 1.36 +++ ChangeLog 21 Jul 2010 17:43:59 -0000 1.37 @@ -1,4 +1,11 @@ -2010-07-15 root +2010-07-21 Gunnar Wrobel
+ + * templates/Kolab_Filter-0.1.10/rc.filter.template: + + kolab/issue3522 (No logrotate for kolab-filter.log and friends) + + +2010-07-15 Gunnar Wrobel
* package.info: Update to 0.1.10. Index: Kolab_Filter.spec =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- Kolab_Filter.spec 15 Jul 2010 21:57:23 -0000 1.31 +++ Kolab_Filter.spec 21 Jul 2010 17:43:59 -0000 1.32 @@ -7,7 +7,7 @@ %define V_repo_commit %define V_repo_release %define V_version 0.1.10 -%define V_release 20100715 +%define V_release 20100721 %define V_sourceurl http://pear.horde.org/get %define V_php_lib_loc php %define V_www_loc @@ -26,7 +26,9 @@ Distribution: OpenPKG # List of Sources -Source: %{V_sourceurl}/%{V_pear_package}-%{V_version}.tgz +Source0: %{V_sourceurl}/%{V_pear_package}-%{V_version}.tgz +Source1: filter.conf.template +Source2: rc.filter.template # List of patches Patch0: package.patch @@ -85,6 +87,7 @@ %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-filter/locks %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-filter/tmp %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/man/man1 + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"\ PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \ @@ -103,6 +106,9 @@ cp $RPM_BUILD_ROOT/%{l_prefix}/lib/php/doc/Kolab_Filter/man/man1/kolabfilter.1 $RPM_BUILD_ROOT/%{l_prefix}/man/man1 cd $RPM_BUILD_ROOT/%{l_prefix}/man/man1 && ln -s kolabfilter.1 kolabmailboxfilter.1 && cd - + + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-filter/tmp \ Index: Makefile =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile 22 Jan 2010 15:36:03 -0000 1.13 +++ Makefile 21 Jul 2010 17:43:59 -0000 1.14 @@ -1,2 +1,7 @@ SPEC_PRESENT = yes include ../../make-helper/pear.mk + +# Get the list of templates if there are any in the template directory +TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null) + +EXTRA = package.patch $(TEMPLATES) Index: package.info =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/package.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- package.info 16 Jul 2010 19:14:31 -0000 1.6 +++ package.info 21 Jul 2010 17:43:59 -0000 1.7 @@ -16,7 +16,7 @@ version='0.1.10' # Package release number -release='20100715' +release='20100721' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel' From cvs at kolab.org Wed Jul 21 19:44:01 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 Jul 2010 19:44:01 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog, 1.33, 1.34 Kolab_FreeBusy.spec, 1.32, 1.33 package.info, 1.9, 1.10 Message-ID: <20100721174401.A3ECA60015D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy In directory doto:/tmp/cvs-serv6055/Kolab_Freebusy Modified Files: ChangeLog Kolab_FreeBusy.spec package.info Log Message: kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- ChangeLog 25 Jun 2010 08:38:18 -0000 1.33 +++ ChangeLog 21 Jul 2010 17:43:59 -0000 1.34 @@ -1,3 +1,9 @@ +2010-07-21 Gunnar Wrobel
+ + * templates/Kolab_FreeBusy-0.1.7/rc.freebusy.template: + + kolab/issue3522 (No logrotate for kolab-filter.log and friends) + 2010-06-25 Gunnar Wrobel
* patches/Kolab_FreeBusy-0.1.7/Kolab_FreeBusy_0.1.7_p2.patch: Index: Kolab_FreeBusy.spec =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Kolab_FreeBusy.spec 16 Jul 2010 20:59:21 -0000 1.32 +++ Kolab_FreeBusy.spec 21 Jul 2010 17:43:59 -0000 1.33 @@ -7,7 +7,7 @@ %define V_repo_commit %define V_repo_release %define V_version 0.1.7 -%define V_release 20100716 +%define V_release 20100721 %define V_sourceurl http://pear.horde.org/get %define V_php_lib_loc php %define V_www_loc freebusy @@ -28,6 +28,7 @@ # List of Sources Source0: %{V_sourceurl}/%{V_pear_package}-%{V_version}.tgz Source1: freebusy.conf.template +Source2: rc.freebusy.template # List of patches Patch0: package.patch @@ -94,7 +95,7 @@ cp -a $RPM_BUILD_ROOT/%{l_prefix}/lib/%{V_php_lib_loc} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/%{l_prefix}/lib/ %endif - %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \ + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ Index: package.info =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/package.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- package.info 16 Jul 2010 20:59:21 -0000 1.9 +++ package.info 21 Jul 2010 17:43:59 -0000 1.10 @@ -16,7 +16,7 @@ version='0.1.7' # Package release number -release='20100716' +release='20100721' # Source URL to download from sourceurl='http://pear.horde.org/get' From cvs at kolab.org Wed Jul 21 19:44:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 Jul 2010 19:44:28 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.568,1.569 Message-ID: <20100721174428.AD54760014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv6140 Modified Files: release-notes.txt Log Message: kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.568 retrieving revision 1.569 diff -u -d -r1.568 -r1.569 --- release-notes.txt 17 Jul 2010 14:51:16 -0000 1.568 +++ release-notes.txt 21 Jul 2010 17:44:26 -0000 1.569 @@ -78,6 +78,7 @@ kolab/issue3289 (resmgr dies when it should accept, but has not Calender folder access) kolab/issue3364 (manpages for kolabfilter and kolabmailboxfilter) + kolab/issue3522 (No logrotate for kolab-filter.log and friends) kolab/issue3560 (php error when inviting outside of free/busy interval) kolab/issue3616 (automatic replies to invitations contain 127.0.0.1 in Message-ID) @@ -108,6 +109,7 @@ kolab/issue3446 (SERVER_NAME undefined in freebusy/regenerate.php) kolab/issue3450 (freebusy/user at example.com.ifb returns extended free/busy information) + kolab/issue3522 (No logrotate for kolab-filter.log and friends) kolab/issue3527 (no immediately printing of folders during freebusy cache regeneration) kolab/issue3537 (Allowing xfb access to groups does not work) @@ -186,6 +188,7 @@ deleted) kolab/issue3490 (Please include dist_conf/kolabsrv.in in source packages) + kolab/issue3522 (No logrotate for kolab-filter.log and friends) kolab/issue3584 (rfc2739 is not copyrightable nor licensable) kolab/issue3765 (dist_conf'iguration for openldap module loading) kolab/issue3953 (use spamassassin_confdir in local.cf.template comment) From cvs at kolab.org Wed Jul 21 19:44:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 Jul 2010 19:44:40 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.43, NONE Message-ID: <20100721174440.725D660015A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv6154/templates Removed Files: resmgr.conf.template.in Log Message: kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs. --- resmgr.conf.template.in DELETED --- From cvs at kolab.org Wed Jul 21 19:44:40 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 21 Jul 2010 19:44:40 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.299, 1.300 Makefile.am, 1.58, 1.59 kolab.globals.in, 1.31, 1.32 rc.kolabd.in, 1.5, 1.6 Message-ID: <20100721174440.6EAD460014B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv6154 Modified Files: ChangeLog Makefile.am kolab.globals.in rc.kolabd.in Log Message: kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.299 retrieving revision 1.300 diff -u -d -r1.299 -r1.300 --- ChangeLog 17 Jul 2010 13:59:14 -0000 1.299 +++ ChangeLog 21 Jul 2010 17:44:38 -0000 1.300 @@ -1,3 +1,9 @@ +2010-07-21 Gunnar Wrobel
+ + * kolab.globals.in, rc.kolabd.in: + + kolab/issue3522 (No logrotate for kolab-filter.log and friends) + 2010-07-17 Gunnar Wrobel
* kolab2.schema, horde.schema, rfc2739.schema: Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- Makefile.am 17 Jul 2010 14:05:00 -0000 1.58 +++ Makefile.am 21 Jul 2010 17:44:38 -0000 1.59 @@ -53,7 +53,6 @@ templates/kolab_smtpdpolicy.conf.template \ templates/php.ini.template \ templates/relocated.template \ - templates/resmgr.conf.template \ templates/saslauthd.conf.template \ templates/session_vars.php.template \ templates/slapd.access.template \ Index: kolab.globals.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- kolab.globals.in 28 Jun 2010 08:43:29 -0000 1.31 +++ kolab.globals.in 21 Jul 2010 17:44:38 -0000 1.32 @@ -44,6 +44,7 @@ kolab_rgrp: @kolab_rgrp@ kolab_musr: @kolab_musr@ kolab_mgrp: @kolab_mgrp@ +kolab_susr: @kolab_susr@ kolab_hooksdir: @kolab_hooksdir@ kolab_quotawarning: @kolab_quotawarning@ hashmethod: @sbindir@/slappasswd -s @@ -107,3 +108,12 @@ freebusy_log_name: @freebusy_log_name@ freebusy_logdir: @freebusy_logdir@ freebusy_cachedir: @freebusy_cachedir@ +resmgr_confdir: @resmgr_confdir@ +resmgr_conffile_usr: @resmgr_conffile_usr@ +resmgr_conffile_grp: @resmgr_conffile_grp@ +resmgr_tmpdir: @resmgr_tmpdir@ +resmgr_localedir: @resmgr_localedir@ +resmgr_locksdir: @resmgr_locksdir@ +resmgr_logdir: @resmgr_logdir@ +resmgr_log_type: @resmgr_log_type@ +resmgr_log_name: @resmgr_log_name@ Index: rc.kolabd.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/rc.kolabd.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- rc.kolabd.in 21 Nov 2008 13:12:36 -0000 1.5 +++ rc.kolabd.in 21 Jul 2010 17:44:38 -0000 1.6 @@ -5,22 +5,6 @@ %config kolabd_enable="$openpkg_rc_def" - kolabd_log_resmgr_logfile="@resmgr_logfile@" - kolabd_log_resmgr_owner="@kolab_usr@" - kolabd_log_resmgr_group="@kolab_grp@" - kolabd_log_resmgr_prolog="true" - kolabd_log_resmgr_epilog="true" - kolabd_log_resmgr_numfiles="10" - kolabd_log_resmgr_minsize="1M" - kolabd_log_resmgr_complevel="9" - kolabd_log_freebusy_logfile="@freebusy_logfile@" - kolabd_log_freebusy_owner="@kolab_usr@" - kolabd_log_freebusy_group="@kolab_grp@" - kolabd_log_freebusy_prolog="true" - kolabd_log_freebusy_epilog="true" - kolabd_log_freebusy_numfiles="10" - kolabd_log_freebusy_minsize="1M" - kolabd_log_freebusy_complevel="9" kolabd_log_fbview_logfile="@fbview_logfile@" kolabd_log_fbview_owner="@kolab_usr@" kolabd_log_fbview_group="@kolab_grp@" @@ -71,22 +55,6 @@ %daily -u @kolab_susr@ rcService kolabd enable yes || exit 0 # rotate logfiles - shtool rotate -f \ - -n ${kolabd_log_resmgr_numfiles} -s ${kolabd_log_resmgr_minsize} -d \ - -z ${kolabd_log_resmgr_complevel} -m 640 \ - -o ${kolabd_log_resmgr_owner} \ - -g ${kolabd_log_resmgr_group} \ - -P "${kolabd_log_resmgr_prolog}" \ - -E "${kolabd_log_resmgr_epilog}" \ - "${kolabd_log_resmgr_logfile}" - shtool rotate -f \ - -n ${kolabd_log_freebusy_numfiles} -s ${kolabd_log_freebusy_minsize} -d \ - -z ${kolabd_log_freebusy_complevel} -m 640 \ - -o ${kolabd_log_freebusy_owner} \ - -g ${kolabd_log_freebusy_group} \ - -P "${kolabd_log_freebusy_prolog}" \ - -E "${kolabd_log_freebusy_epilog}" \ - "${kolabd_log_freebusy_logfile}" shtool rotate -f \ -n ${kolabd_log_fbview_numfiles} -s ${kolabd_log_fbview_minsize} -d \ -z ${kolabd_log_fbview_complevel} -m 640 \ From cvs at kolab.org Thu Jul 22 15:59:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 22 Jul 2010 15:59:46 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.569,1.570 Message-ID: <20100722135946.A9AD760015A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv558 Modified Files: release-notes.txt Log Message: kolab/issue4436 (free/busy interval is often too low) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.569 retrieving revision 1.570 diff -u -d -r1.569 -r1.570 --- release-notes.txt 21 Jul 2010 17:44:26 -0000 1.569 +++ release-notes.txt 22 Jul 2010 13:59:44 -0000 1.570 @@ -97,7 +97,7 @@ kolab/issue3525 (free/busy regeneration aborts for unparsable events) kolab/issue3528 (Events with broken encoding should work) - - Kolab_FreeBusy-0.1.6-2009???? + - Kolab_FreeBusy-0.1.7-2009???? Improved handling of dba access. Extended support for more complex scenario testing. @@ -120,6 +120,7 @@ kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2) kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder) + kolab/issue4436 (free/busy interval is often too low) - Kolab_Resource-0.1.0-2010???? From cvs at kolab.org Thu Jul 22 15:59:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 22 Jul 2010 15:59:46 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7 freebusy.conf.template, 1.2, 1.3 Message-ID: <20100722135946.AD1C8600579@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7 In directory doto:/tmp/cvs-serv558/d/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7 Modified Files: freebusy.conf.template Log Message: kolab/issue4436 (free/busy interval is often too low) Index: freebusy.conf.template =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/templates/Kolab_FreeBusy-0.1.7/freebusy.conf.template,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- freebusy.conf.template 16 Jul 2010 20:59:21 -0000 1.2 +++ freebusy.conf.template 22 Jul 2010 13:59:44 -0000 1.3 @@ -157,6 +157,12 @@ */ $conf['fb']['use_acls'] = true; +/* How many days in advance should the free/busy information be calculated? This + * is the default value that can be overwritten by the kolabFreeBusyFuture + * attribute of the users LDAP account. + */ +$conf['fb']['future_days'] = 180; + /* The resulting vCalendar file is being cached. The following setting * determines how many seconds it will be delivered without checking if * the contents of the file might have changed. A negative setting disables From cvs at kolab.org Thu Jul 22 15:59:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 22 Jul 2010 15:59:46 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog, 1.34, 1.35 Kolab_FreeBusy.spec, 1.33, 1.34 package.info, 1.10, 1.11 Message-ID: <20100722135946.A6285600148@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy In directory doto:/tmp/cvs-serv558/d/Kolab_Freebusy Modified Files: ChangeLog Kolab_FreeBusy.spec package.info Log Message: kolab/issue4436 (free/busy interval is often too low) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- ChangeLog 21 Jul 2010 17:43:59 -0000 1.34 +++ ChangeLog 22 Jul 2010 13:59:44 -0000 1.35 @@ -1,3 +1,9 @@ +2010-07-22 Gunnar Wrobel
+ + * patches/Kolab_FreeBusy-0.1.7/Kolab_FreeBusy_0.1.7_p3.patch: + + kolab/issue4436 (free/busy interval is often too low) + 2010-07-21 Gunnar Wrobel
* templates/Kolab_FreeBusy-0.1.7/rc.freebusy.template: Index: Kolab_FreeBusy.spec =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Kolab_FreeBusy.spec 21 Jul 2010 17:43:59 -0000 1.33 +++ Kolab_FreeBusy.spec 22 Jul 2010 13:59:44 -0000 1.34 @@ -7,7 +7,7 @@ %define V_repo_commit %define V_repo_release %define V_version 0.1.7 -%define V_release 20100721 +%define V_release 20100722 %define V_sourceurl http://pear.horde.org/get %define V_php_lib_loc php %define V_www_loc freebusy Index: package.info =================================================================== RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/package.info,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- package.info 21 Jul 2010 17:43:59 -0000 1.10 +++ package.info 22 Jul 2010 13:59:44 -0000 1.11 @@ -16,7 +16,7 @@ version='0.1.7' # Package release number -release='20100721' +release='20100722' # Source URL to download from sourceurl='http://pear.horde.org/get' From cvs at kolab.org Thu Jul 22 15:59:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 22 Jul 2010 15:59:46 +0200 (CEST) Subject: gunnar: server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7 Kolab_FreeBusy_0.1.7_p3.patch, NONE, 1.1 Message-ID: <20100722135946.A891E60014E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7 In directory doto:/tmp/cvs-serv558/d/Kolab_Freebusy/patches/Kolab_FreeBusy-0.1.7 Added Files: Kolab_FreeBusy_0.1.7_p3.patch Log Message: kolab/issue4436 (free/busy interval is often too low) --- NEW FILE: Kolab_FreeBusy_0.1.7_p3.patch --- From: Gunnar Wrobel Subject: [PATCH] Kolab_FreeBusy_0.1.7_p3.patch kolab/issue4436 (free/busy interval is often too low) STATUS: MERGED REF: https://issues.kolab.org/issue4436 REF: http://git.horde.org/diff.php/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Attic/Cache.php?sa=1&r1=1.17.2.10&r2=1.17.2.11&rt=horde Signed-off-by: Gunnar Wrobel --- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php 15 Jun 2010 12:00:33 -0000 1.17.2.10 +++ a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php 22 Jul 2010 13:03:07 -0000 @@ -131,8 +131,8 @@ } $vCal = $fb->generate(null, null, - !empty($fbpast)?$fbpast:0, - !empty($fbfuture)?$fbfuture:60, + !empty($fbpast) ? $fbpast : 0, + !empty($fbfuture)? $fbfuture : $conf['fb']['future_days'], $access->owner, $access->owner_object->get(KOLAB_ATTR_CN)); if (is_a($vCal, 'PEAR_Error')) { From cvs at kolab.org Sun Jul 25 22:18:19 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 25 Jul 2010 22:18:19 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.570,1.571 Message-ID: <20100725201819.54DC460058B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv24554 Modified Files: release-notes.txt Log Message: kolab/issue3562 (tentative answer when inviting outside of free/busy interval is confusing) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.570 retrieving revision 1.571 diff -u -d -r1.570 -r1.571 --- release-notes.txt 22 Jul 2010 13:59:44 -0000 1.570 +++ release-notes.txt 25 Jul 2010 20:18:17 -0000 1.571 @@ -126,6 +126,8 @@ kolab/issue4434 (Resource (Reject if conflicts) accepts recurring event even if second occurrence is busy) + kolab/issue4481 (Automatically trigger a resource when booking + in case its free/busy information is too old) - Kolab_Server-0.5.0-2010???? From cvs at kolab.org Sun Jul 25 22:18:19 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 25 Jul 2010 22:18:19 +0200 (CEST) Subject: gunnar: server/pear/Kolab_Resource ChangeLog, 1.1, 1.2 package.info, 1.1, 1.2 Message-ID: <20100725201819.6A50060058D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/pear/Kolab_Resource In directory doto:/tmp/cvs-serv24554/d/Kolab_Resource Modified Files: ChangeLog package.info Log Message: kolab/issue3562 (tentative answer when inviting outside of free/busy interval is confusing) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/pear/Kolab_Resource/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ChangeLog 15 Jul 2010 21:52:49 -0000 1.1 +++ ChangeLog 25 Jul 2010 20:18:17 -0000 1.2 @@ -1,3 +1,12 @@ +2010-07-25 Gunnar Wrobel
+ + * package.info: + + Update to Kolab-Resource-0.1.1. + + kolab/issue3562 (tentative answer when inviting outside of + free/busy interval is confusing) + 2010-07-14 Gunnar Wrobel
* package.info: Added package to Kolab CVS. Index: package.info =================================================================== RCS file: /kolabrepository/server/pear/Kolab_Resource/package.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- package.info 15 Jul 2010 21:52:49 -0000 1.1 +++ package.info 25 Jul 2010 20:18:17 -0000 1.2 @@ -13,10 +13,10 @@ package_origin='WGET' # Version number -version='0.1.0' +version='0.1.1' # Package release number -release='20100714' +release='20100725' # Source URL to download from sourceurl='http://files.kolab.org/incoming/wrobel' From cvs at kolab.org Mon Aug 23 10:44:07 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 10:44:07 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES messages.po, 1.45, 1.46 Message-ID: <20100823084407.6712E60057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES In directory doto:/tmp/cvs-serv2787/d/kolab-webadmin/php/admin/locale/de/LC_MESSAGES Modified Files: messages.po Log Message: kolab/issue4511 (Correct the German web admin translation) Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- messages.po 21 May 2010 15:58:20 -0000 1.45 +++ messages.po 23 Aug 2010 08:44:05 -0000 1.46 @@ -26,7 +26,7 @@ #: tpl_messages.php:4 msgid "Back to list of addresses" -msgstr "Zurück zur Liste der Adressen" +msgstr "Zurück zur Adressliste" #: tpl_messages.php:5 tpl_messages.php:10 msgid "(only external addresses without a kolab user account)" @@ -50,7 +50,7 @@ #: tpl_messages.php:74 tpl_messages.php:84 tpl_messages.php:137 #: tpl_messages.php:200 tpl_messages.php:223 msgid "Modify" -msgstr "Verändern" +msgstr "Bearbeiten" #: tpl_messages.php:9 tpl_messages.php:19 tpl_messages.php:29 #: tpl_messages.php:75 tpl_messages.php:85 tpl_messages.php:138 @@ -178,7 +178,7 @@ #: ../../../www/admin/user/user.php.in:386 #: ../../../www/admin/user/user.php.in:389 msgid "Required" -msgstr "Obligatorisch" +msgstr "Pflichtfeld" #: tpl_messages.php:38 ../../../www/admin/addressbook/addr.php.in:91 #: ../../../www/admin/administrator/admin.php.in:142 @@ -200,7 +200,7 @@ #: ../../../www/admin/maintainer/maintainer.php.in:146 #: ../../../www/admin/user/user.php.in:394 msgid "Verify Password" -msgstr "Passwort überprüfen" +msgstr "Passwort bestätigen" #: tpl_messages.php:44 ../../../www/admin/user/user.php.in:398 msgid "Primary Email Address" @@ -213,7 +213,7 @@ #: ../../../www/admin/user/user.php.in:375 #: ../../../www/admin/user/user.php.in:377 msgid "Required, non volatile" -msgstr "Obligatorisch, nicht-flüchtig" +msgstr "Pflichtfeld, unveränderlich" #: tpl_messages.php:46 ../../../www/admin/addressbook/addr.php.in:94 #: ../../../www/admin/user/user.php.in:433 @@ -285,7 +285,7 @@ #: tpl_messages.php:60 msgid "User Quota in KB" -msgstr "Plattenplatz des Benutzers in KBytes" +msgstr "Kontingent des Benutzers in KBytes" #: tpl_messages.php:61 ../../../www/admin/user/user.php.in:448 msgid "Leave blank for unlimited" @@ -681,7 +681,7 @@ "The principal authors of the Kolab client and server software are (in " "alphabetical order):" msgstr "" -"Die Hauptentiwckler der Kolab-Klienten- und Server-Software sind (in " +"Die Hauptentwickler der Kolab-Klienten- und Server-Software sind (in " "alphabetischer Reihenfolge):" #: tpl_messages.php:125 @@ -786,7 +786,7 @@ #: tpl_messages.php:154 msgid "Quota settings" -msgstr "Plattenplatz-Einstellungen" +msgstr "Plattenplatz-Kontingent-Einstellungen" #: tpl_messages.php:155 msgid "Warn users when they have used" @@ -795,7 +795,7 @@ #: tpl_messages.php:156 #, php-format msgid "% of their quota" -msgstr "% des zugestandenen Plattenplatzes beträgt" +msgstr "% des zugestandenen Kontingents beträgt" #: tpl_messages.php:158 msgid "Free/Busy settings" @@ -1059,7 +1059,7 @@ #: tpl_messages.php:242 msgid "PEAR/Horde Versions" -msgstr "" +msgstr "PEAR/Horde-Versionen" #: tpl_messages.php:243 msgid "Kolab2 Patched OpenPKG Package Versions" @@ -1098,7 +1098,7 @@ #: ../../../www/admin/sharedfolder/sf.php.in:112 #: ../../../www/admin/user/user.php.in:349 msgid "Error: need valid action to proceed" -msgstr "Fehler: kann nicht weitermachen ohne zulässige Aktion" +msgstr "Fehler: Kann nicht weitermachen ohne zulässige Aktion" #: ../../../www/admin/addressbook/addr.php.in:81 #: ../../../www/admin/administrator/admin.php.in:127 @@ -1109,7 +1109,7 @@ #: ../../../www/admin/user/user.php.in:370 #: ../../../www/admin/user/user.php.in:772 msgid "Error: You don't have the required Permissions" -msgstr "Fehler: Sie haben die erforderlichen Zugriffsrechte nicht" +msgstr "Fehler: Sie haben nicht die erforderlichen Zugriffsrechte" #: ../../../www/admin/addressbook/addr.php.in:95 msgid "Primary E-Mail Address" @@ -1147,7 +1147,7 @@ "depends on it. To modify this entry, first remove it from the distribution " "list." msgstr "" -"Der DN der Adresse konnte nicht verändert werden; Verteilerliste '%s' " "hängt davon ab. Um dieses Konto zu verändern, müssen Sie es erst aus der " "Verteilerliste entfernen." @@ -1191,7 +1191,7 @@ #: ../../../www/admin/sharedfolder/sf.php.in:247 #, php-format msgid "LDAP Error: could not read %s: %s" -msgstr "LDAP-Fehler: konnte %s nicht lesen: %s" +msgstr "LDAP-Fehler: Konnte %s nicht lesen: %s" #: ../../../www/admin/addressbook/addr.php.in:215 #: ../../../www/admin/administrator/admin.php.in:238 @@ -1200,7 +1200,7 @@ #: ../../../www/admin/sharedfolder/sf.php.in:251 #, php-format msgid "LDAP Error: could not modify object %s: %s" -msgstr "LDAP-Fehler: konnte Objekt %s nicht modifizieren: %s" +msgstr "LDAP-Fehler: Konnte Objekt %s nicht ändern: %s" #: ../../../www/admin/addressbook/addr.php.in:227 #: ../../../www/admin/administrator/admin.php.in:256 @@ -1210,7 +1210,7 @@ #: ../../../www/admin/user/user.php.in:689 #, php-format msgid "LDAP Error: could not add object %s: %s" -msgstr "LDAP-Fehler: konnte Objekt %s nicht hinzufügen: %s" +msgstr "LDAP-Fehler: Konnte Objekt %s nicht hinzufügen: %s" #: ../../../www/admin/addressbook/addr.php.in:230 #, php-format @@ -1220,7 +1220,7 @@ #: ../../../www/admin/addressbook/addr.php.in:240 #: ../../../www/admin/addressbook/addr.php.in:258 msgid "Modify External Address" -msgstr "Externe Adresse verändern" +msgstr "Externe Adresse bearbeiten" #: ../../../www/admin/addressbook/addr.php.in:261 #: ../../../www/admin/addressbook/addr.php.in:281 @@ -1257,7 +1257,7 @@ #: ../../../www/admin/addressbook/addr.php.in:312 #, php-format msgid "LDAP Error: could not delete %s: %s" -msgstr "LDAP-Fehler: konnte %s nicht löschen: %s" +msgstr "LDAP-Fehler: Konnte %s nicht löschen: %s" #: ../../../www/admin/addressbook/addr.php.in:315 #: ../../../www/admin/distributionlist/list.php.in:312 @@ -1288,12 +1288,12 @@ #: ../../../www/admin/addressbook/index.php.in:125 #: ../../../www/admin/user/index.php.in:188 msgid "begins with" -msgstr "fängt an mit" +msgstr "beginnt mit" #: ../../../www/admin/addressbook/index.php.in:126 #: ../../../www/admin/user/index.php.in:189 msgid "ends with" -msgstr "endete mit" +msgstr "endet mit" #: ../../../www/admin/administrator/admin.php.in:52 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:53 @@ -1310,7 +1310,7 @@ #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:110 #: ../../../www/admin/maintainer/maintainer.php.in:132 msgid "non volatile" -msgstr "nicht-flüchtig" +msgstr "unveränderlich" #: ../../../www/admin/administrator/admin.php.in:136 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:111 @@ -1336,7 +1336,7 @@ #: ../../../www/admin/administrator/admin.php.in:243 #: ../../../www/admin/administrator/admin.php.in:293 msgid "Modify Administrator" -msgstr "Administrator verändern" +msgstr "Administrator bearbeiten" #: ../../../www/admin/administrator/admin.php.in:244 #: ../../../www/admin/administrator/admin.php.in:266 @@ -1347,14 +1347,14 @@ #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244 #: ../../../www/admin/maintainer/maintainer.php.in:241 msgid " successfully modified" -msgstr " erfolgreich verändert" +msgstr " erfolgreich geändert" #: ../../../www/admin/administrator/admin.php.in:262 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:265 #: ../../../www/admin/maintainer/maintainer.php.in:261 #, php-format msgid "LDAP Error: could not add object %s to maintainer group: %s" -msgstr "LDAP-Fehler: konnte Objekt %s nicht zur Verwaltergruppe hinzufügen: %s" +msgstr "LDAP-Fehler: Konnte Objekt %s nicht zur Verwaltergruppe hinzufügen: %s" #: ../../../www/admin/administrator/admin.php.in:266 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272 @@ -1390,14 +1390,14 @@ #, php-format msgid "LDAP Error: Could not remove %s from admin group: %s" msgstr "" -"LDAP-Fehler: Konnte %s nicht aus der Verwalter-Gruppe nicht entfernen: %s" +"LDAP-Fehler: Konnte %s nicht aus der Administratoren-Gruppe entfernen: %s" #: ../../../www/admin/administrator/admin.php.in:322 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:326 #: ../../../www/admin/maintainer/maintainer.php.in:322 #, php-format msgid "LDAP Error: could not mark %s for deletion: %s" -msgstr "LDAP-Fehler: konnte %s nicht zum Löschen vormerken: %s" +msgstr "LDAP-Fehler: Konnte %s nicht zum Löschen vormerken: %s" #: ../../../www/admin/administrator/admin.php.in:328 msgid "Administrator Deleted" @@ -1432,7 +1432,7 @@ #: ../../../www/admin/distributionlist/list.php.in:62 msgid "User or distribution list with this email address already exists" msgstr "" -"Es existiert bereits eine Benutzer oder Verteilerliste mit dieser E-Mail-" +"Es existiert bereits ein Benutzer oder eine Verteilerliste mit dieser E-Mail-" "Adresse" #: ../../../www/admin/distributionlist/list.php.in:111 @@ -1477,7 +1477,7 @@ #: ../../../www/admin/user/user.php.in:637 #, php-format msgid "LDAP Error: Could not read %s: %s" -msgstr "LDAP-Fehler: konnte %s nicht lesen: %s" +msgstr "LDAP-Fehler: Konnte %s nicht lesen: %s" #: ../../../www/admin/distributionlist/list.php.in:220 #: ../../../www/admin/distributionlist/list.php.in:249 @@ -1487,12 +1487,12 @@ #: ../../../www/admin/user/user.php.in:714 #, php-format msgid "LDAP Error: Could not modify object %s: %s" -msgstr "LDAP-Fehler: konnte Objekt %s nicht modifizieren: %s" +msgstr "LDAP-Fehler: Konnte Objekt %s nicht ändern: %s" #: ../../../www/admin/distributionlist/list.php.in:231 #, php-format msgid "LDAP Error: Could not add object %s: %s" -msgstr "LDAP-Fehler: konnte Objekt %s nicht hinzufügen: %s" +msgstr "LDAP-Fehler: Konnte Objekt %s nicht hinzufügen: %s" #: ../../../www/admin/distributionlist/list.php.in:252 #: ../../../www/admin/user/user.php.in:702 @@ -1510,7 +1510,7 @@ #: ../../../www/admin/distributionlist/list.php.in:272 #: ../../../www/admin/distributionlist/list.php.in:286 msgid "Modify Distribution List" -msgstr "Verteilerliste verändern" +msgstr "Verteilerliste bearbeiten" #: ../../../www/admin/distributionlist/list.php.in:289 #: ../../../www/admin/distributionlist/list.php.in:304 @@ -1535,7 +1535,7 @@ #: ../../../www/admin/distributionlist/list.php.in:315 #, php-format msgid "LDAP Error: Could not delete %s: %s" -msgstr "LDAP-Fehler: konnte %s nicht löschen: %s" +msgstr "LDAP-Fehler: Konnte %s nicht löschen: %s" #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:49 msgid "Please enter a uid value" @@ -1544,12 +1544,12 @@ #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:137 msgid "Check domains this domain maintainer should be able to maintain" msgstr "" -"Überprüfen der Domänen, die dieser Domänenverwalter verwalten können sollte" +"Kreuzen Sie die Domänen an, die dieser Domänenverwalter verwalten können sollte" #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:243 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:296 msgid "Modify Domain Maintainer" -msgstr "Domänenverwalter verändern" +msgstr "Domänenverwalter bearbeiten" #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:244 #: ../../../www/admin/maintainer/maintainer.php.in:241 @@ -1601,7 +1601,7 @@ #: ../../../www/admin/maintainer/maintainer.php.in:240 #: ../../../www/admin/maintainer/maintainer.php.in:292 msgid "Modify Maintainer" -msgstr "Verwalter verändern" +msgstr "Verwalter bearbeiten" #: ../../../www/admin/maintainer/maintainer.php.in:266 #: ../../../www/admin/maintainer/maintainer.php.in:272 @@ -1656,7 +1656,7 @@ #: ../../../www/admin/settings/index.php.in:223 #, php-format msgid "LDAP Error: Failed to delete domain object %s: %s" -msgstr "LDAP-Fehler: konnte das Domänen-Objekt %s nicht löschen: %s" +msgstr "LDAP-Fehler: Konnte das Domänen-Objekt %s nicht löschen: %s" #: ../../../www/admin/settings/index.php.in:273 msgid "POP3 Service" @@ -1748,7 +1748,7 @@ #: ../../../www/admin/user/user.php.in:379 #: ../../../www/admin/user/user.php.in:381 msgid "Non volatile" -msgstr "Nicht-flüchtig" +msgstr "unveränderlich" #: ../../../www/admin/sharedfolder/sf.php.in:128 msgid "Folder Type" @@ -1756,7 +1756,7 @@ #: ../../../www/admin/sharedfolder/sf.php.in:132 msgid "Quota Limit" -msgstr "Plattenplatzbeschränkung" +msgstr "Plattenplatz-Kontingent" #: ../../../www/admin/sharedfolder/sf.php.in:133 msgid "MBytes (empty for unlimited)" @@ -1783,7 +1783,7 @@ #: ../../../www/admin/sharedfolder/sf.php.in:275 #: ../../../www/admin/sharedfolder/sf.php.in:295 msgid "Modify Shared Folder" -msgstr "Gemeinsam genutzten Ordner verändern" +msgstr "Gemeinsam genutzten Ordner bearbeiten" #: ../../../www/admin/sharedfolder/sf.php.in:311 msgid "Delete Shared Folder" @@ -1791,7 +1791,7 @@ #: ../../../www/admin/sharedfolder/sf.php.in:320 msgid "Shared folder " -msgstr "Gemeinsam genutzte Ordner " +msgstr "Gemeinsam genutzter Ordner " #: ../../../www/admin/sharedfolder/sf.php.in:320 msgid " marked for deletion" @@ -1887,7 +1887,7 @@ #: ../../../www/admin/user/user.php.in:158 #, php-format msgid "Illegal user or group %s" -msgstr "Illegaler Benutzer oder Gruppe %s" +msgstr "Ungültiger Benutzer oder Gruppe %s" #: ../../../www/admin/user/user.php.in:167 msgid "Free/Busy interval can not be negative" @@ -1942,7 +1942,7 @@ #: ../../../www/admin/user/user.php.in:415 msgid "Invitation Policy" -msgstr "Einladungs-Policy" +msgstr "Einladungs-Richtlinie" #: ../../../www/admin/user/user.php.in:419 msgid "For automatic invitation handling" @@ -1976,7 +1976,7 @@ #: ../../../www/admin/user/user.php.in:447 msgid "User Quota in MBytes" -msgstr "Plattenplatz des Benutzers in MBytes" +msgstr "Plattenplatz-Kontingent des Benutzers in MBytes" #: ../../../www/admin/user/user.php.in:460 msgid "Free/Busy interval in days" @@ -1997,12 +1997,12 @@ #: ../../../www/admin/user/user.php.in:670 #: ../../../www/admin/user/user.php.in:750 msgid "Modify User" -msgstr "Benutzer verändern" +msgstr "Benutzer bearbeiten" #: ../../../www/admin/user/user.php.in:671 #, php-format msgid "User '%s' successfully modified" -msgstr "Benutzer '%s' erfolgreich verändert" +msgstr "Benutzer '%s' erfolgreich geändert" #: ../../../www/admin/user/user.php.in:723 msgid "User " @@ -2114,11 +2114,11 @@ #: ../include/auth.class.php.in:45 msgid "Could not bind to LDAP server: " -msgstr "Konnte nicht auf dem LDAP-Server binden: " +msgstr "Anmeldung am LDAP-Server fehlgeschlagen: " #: ../include/auth.class.php.in:56 msgid "Could not bind to LDAP server" -msgstr "Konnte nicht auf dem LDAP-Server binden" +msgstr "Anmeldung am LDAP-Server fehlgeschlagen" #: ../include/auth.class.php.in:83 ../include/auth.class.php.in:87 msgid "Wrong username or password" @@ -2130,7 +2130,7 @@ #: ../include/form.class.php:45 msgid "Quota must be smaller than 4096" -msgstr "Plattenplatz muss kleiner sein als 4096" +msgstr "Plattenplatz-Kontingent muss kleiner sein als 4096" #: ../include/form.class.php:46 msgid "Quota can not be negative" @@ -2138,11 +2138,11 @@ #: ../include/form.class.php:47 msgid "Quota must be a number" -msgstr "Plattenplatz muss eine Zahl sein" +msgstr "Plattenplatz-Kontingent muss eine Zahl sein" #: ../include/form.class.php:48 msgid "Quota must be an integer" -msgstr "Plattenplatz muss eine ganze Zahl sein" +msgstr "Plattenplatz-Kontingent muss eine ganze Zahl sein" #: ../include/form.class.php:55 msgid "" @@ -2190,11 +2190,11 @@ #: ../include/form.class.php:375 msgid "* Required field." -msgstr "* Obligatorisches Feld" +msgstr "* Pflichtfeld" #: ../include/form.class.php:396 ../include/form.class.php:399 msgid "Required field " -msgstr "Obligatorisches Feld " +msgstr "Pflichtfeld " #: ../include/form.class.php:396 ../include/form.class.php:399 msgid " is empty" From cvs at kolab.org Mon Aug 23 10:44:07 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 10:44:07 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.128,1.129 Message-ID: <20100823084407.5A83160057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv2787/d/kolab-webadmin Modified Files: ChangeLog Log Message: kolab/issue4511 (Correct the German web admin translation) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- ChangeLog 12 Jul 2010 21:22:09 -0000 1.128 +++ ChangeLog 23 Aug 2010 08:44:05 -0000 1.129 @@ -1,3 +1,9 @@ +2010-08-23 Gunnar Wrobel
+ + * php/admin/locale/de/LC_MESSAGES/messages.po: + + kolab/issue4511 (Correct the German web admin translation) + 2010-07-12 Gunnar Wrobel
* www/admin/administrator/admin.php.in: From cvs at kolab.org Mon Aug 23 10:44:07 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 10:44:07 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.571,1.572 Message-ID: <20100823084407.94CAF60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv2787 Modified Files: release-notes.txt Log Message: kolab/issue4511 (Correct the German web admin translation) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.571 retrieving revision 1.572 diff -u -d -r1.571 -r1.572 --- release-notes.txt 25 Jul 2010 20:18:17 -0000 1.571 +++ release-notes.txt 23 Aug 2010 08:44:05 -0000 1.572 @@ -54,6 +54,7 @@ nicer) kolab/issue4430 ("Modify User" reply page contains user password in plain text) + kolab/issue4511 (Correct the German web admin translation) - Kolab_Config-0.1.0-2010???? From cvs at kolab.org Mon Aug 23 11:04:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 11:04:57 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.129,1.130 Message-ID: <20100823090457.1C47660057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv3314/kolab-webadmin/kolab-webadmin Modified Files: ChangeLog Log Message: kolab/issue4515 (Sort some additional lists in the web admin) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- ChangeLog 23 Aug 2010 08:44:05 -0000 1.129 +++ ChangeLog 23 Aug 2010 09:04:54 -0000 1.130 @@ -1,5 +1,10 @@ 2010-08-23 Gunnar Wrobel
+ * lib/KolabAdmin/Ldap.php: + * www/admin/settings/index.php.in: + + kolab/issue4515 (Sort some additional lists in the web admin) + * php/admin/locale/de/LC_MESSAGES/messages.po: kolab/issue4511 (Correct the German web admin translation) From cvs at kolab.org Mon Aug 23 11:04:56 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 11:04:56 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.572,1.573 Message-ID: <20100823090456.DFC5260057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv3314 Modified Files: release-notes.txt Log Message: kolab/issue4515 (Sort some additional lists in the web admin) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.572 retrieving revision 1.573 diff -u -d -r1.572 -r1.573 --- release-notes.txt 23 Aug 2010 08:44:05 -0000 1.572 +++ release-notes.txt 23 Aug 2010 09:04:54 -0000 1.573 @@ -55,6 +55,7 @@ kolab/issue4430 ("Modify User" reply page contains user password in plain text) kolab/issue4511 (Correct the German web admin translation) + kolab/issue4515 (Sort some additional lists in the web admin) - Kolab_Config-0.1.0-2010???? From cvs at kolab.org Mon Aug 23 11:04:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 11:04:57 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Ldap.php, 1.3, 1.4 Message-ID: <20100823090457.2041160057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin In directory doto:/tmp/cvs-serv3314/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Modified Files: Ldap.php Log Message: kolab/issue4515 (Sort some additional lists in the web admin) Index: Ldap.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Ldap.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Ldap.php 21 Feb 2010 10:04:49 -0000 1.3 +++ Ldap.php 23 Aug 2010 09:04:55 -0000 1.4 @@ -352,6 +352,7 @@ $domains[] = $val['cn'][0]; } } + sort($domains); return $domains; } @@ -445,8 +446,9 @@ if( $reload || !$this->cached_domains ) { $kolab_obj = $this->read( 'k=kolab,'.$_SESSION['base_dn'] ); if( !$kolab_obj ) return false; + unset($kolab_obj['postfix-mydestination']['count']); + sort($kolab_obj['postfix-mydestination']); $this->cached_domains = $kolab_obj['postfix-mydestination']; - unset($this->cached_domains['count']); debug("loading domains"); } debug("ldap->domains() returns ".join(", ", $this->cached_domains)); From cvs at kolab.org Mon Aug 23 11:04:57 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 11:04:57 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/settings index.php.in, 1.3, 1.4 Message-ID: <20100823090457.284E360057F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/settings In directory doto:/tmp/cvs-serv3314/kolab-webadmin/kolab-webadmin/www/admin/settings Modified Files: index.php.in Log Message: kolab/issue4515 (Sort some additional lists in the web admin) Index: index.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/settings/index.php.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- index.php.in 21 May 2010 15:58:20 -0000 1.3 +++ index.php.in 23 Aug 2010 09:04:55 -0000 1.4 @@ -68,6 +68,7 @@ $postfixmydomain = $attrs['postfix-mydomain'][0]; $postfixmydestination = $attrs['postfix-mydestination']; unset($postfixmydestination['count']); + sort($postfixmydestination); unset( $attrs['postfix-mynetworks']['count'] ); $postfixmynetworks = join(', ',$attrs['postfix-mynetworks']); $postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0]; From cvs at kolab.org Mon Aug 23 15:00:36 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 15:00:36 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.573,1.574 Message-ID: <20100823130036.3B54E60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv7425 Modified Files: release-notes.txt Log Message: kolab/issue4510 (Fix the kolab web admin display for Firefox) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.573 retrieving revision 1.574 diff -u -d -r1.573 -r1.574 --- release-notes.txt 23 Aug 2010 09:04:54 -0000 1.573 +++ release-notes.txt 23 Aug 2010 13:00:33 -0000 1.574 @@ -54,6 +54,7 @@ nicer) kolab/issue4430 ("Modify User" reply page contains user password in plain text) + kolab/issue4510 (Fix the kolab web admin display for Firefox) kolab/issue4511 (Correct the German web admin translation) kolab/issue4515 (Sort some additional lists in the web admin) From cvs at kolab.org Mon Aug 23 15:00:36 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 15:00:36 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.130,1.131 Message-ID: <20100823130036.404D560057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv7425/kolab-webadmin/kolab-webadmin Modified Files: ChangeLog Log Message: kolab/issue4510 (Fix the kolab web admin display for Firefox) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- ChangeLog 23 Aug 2010 09:04:54 -0000 1.130 +++ ChangeLog 23 Aug 2010 13:00:34 -0000 1.131 @@ -1,5 +1,9 @@ 2010-08-23 Gunnar Wrobel
+ * php/admin/include/form.class.php: + + kolab/issue4510 (Fix the kolab web admin display for Firefox) + * lib/KolabAdmin/Ldap.php: * www/admin/settings/index.php.in: From cvs at kolab.org Mon Aug 23 15:00:36 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 15:00:36 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.36, 1.37 Message-ID: <20100823130036.4D5AF60057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv7425/kolab-webadmin/kolab-webadmin/php/admin/include Modified Files: form.class.php Log Message: kolab/issue4510 (Fix the kolab web admin display for Firefox) Index: form.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- form.class.php 12 Jul 2010 21:22:09 -0000 1.36 +++ form.class.php 23 Aug 2010 13:00:34 -0000 1.37 @@ -213,7 +213,7 @@ $str .= '
'.$value['name'].' '.(join('
',$value['options'])).'
'.(join('
',$value['options'])).'
'; foreach( $value['options'] as $opt ) { From cvs at kolab.org Mon Aug 23 16:10:08 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 16:10:08 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd/dist_conf common,1.60,1.61 Message-ID: <20100823141008.3138160057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd/dist_conf In directory doto:/tmp/cvs-serv8918/kolabd/kolabd/dist_conf Modified Files: common Log Message: kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: common =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- common 28 Jun 2010 08:43:29 -0000 1.60 +++ common 23 Aug 2010 14:10:06 -0000 1.61 @@ -115,8 +115,10 @@ -e 's=[@]ldapserver_usr[@]=$(ldapserver_usr)=g' \ -e 's=[@]ldapserver_modulepath[@]=$(ldapserver_modulepath)=g' \ -e 's=[@]pear_horde_pkgs[@]=$(pear_horde_pkgs)=g' \ + -e 's=[@]phplibdir2[@]=$(phplibdir2)=g' \ -e 's=[@]pkgdocdir[@]=$(pkgdocdir)=g' \ -e 's=[@]pki_grp[@]=$(pki_grp)=g' \ + -e 's=[@]prefix[@]=$(prefix)=g' \ -e 's=[@]resmgr_confdir[@]=$(resmgr_confdir)=g' \ -e 's=[@]resmgr_conffile_grp[@]=$(resmgr_conffile_grp)=g' \ -e 's=[@]resmgr_conffile_usr[@]=$(resmgr_conffile_usr)=g' \ From cvs at kolab.org Mon Aug 23 16:10:08 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 16:10:08 +0200 (CEST) Subject: gunnar: server/kolabd/kolabd kolab.globals.in, 1.32, 1.33 ChangeLog, 1.300, 1.301 Message-ID: <20100823141008.2DCFE60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv8918/kolabd/kolabd Modified Files: kolab.globals.in ChangeLog Log Message: kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: kolab.globals.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- kolab.globals.in 21 Jul 2010 17:44:38 -0000 1.32 +++ kolab.globals.in 23 Aug 2010 14:10:06 -0000 1.33 @@ -56,6 +56,7 @@ sbindir: @sbindir@ webserver_logdir: @webserver_logdir@ webserver_document_root: @webserver_document_root@ +webserver_musr: @webserver_musr@ webserver_usr: @webserver_usr@ webserver_grp: @webserver_grp@ webclient_data_root: @webclient_data_root@ @@ -97,7 +98,6 @@ kolab_scriptsdir : @kolab_scriptsdir@ pki_grp : @pki_grp@ TAR : @TAR@ -kolab_wui : @kolab_wui@ syncrepl_cookie_file : @kolab_statedir@/syncrepl_cookie imap_confdir : @imap_confdir@ imappartitions_script : @sbindir@/kolab_imappartitions @@ -117,3 +117,7 @@ resmgr_logdir: @resmgr_logdir@ resmgr_log_type: @resmgr_log_type@ resmgr_log_name: @resmgr_log_name@ +kolab_wui : @kolab_wui@ +kolab_php_module_prefix : @kolab_php_module_prefix@ +prefix : @prefix@ +phplibdir2 : @phplibdir2@ Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.300 retrieving revision 1.301 diff -u -d -r1.300 -r1.301 --- ChangeLog 21 Jul 2010 17:44:38 -0000 1.300 +++ ChangeLog 23 Aug 2010 14:10:06 -0000 1.301 @@ -1,3 +1,12 @@ +2010-08-23 Gunnar Wrobel
+ + * kolab.globals.in: + * dist_conf/common: + + Add a few more variables to the kolab.globals file to support a + decent configuration template for the Kolab webadmin. + kolab/issue4512 (Allow to hide the admin mail settings in the web admin) + 2010-07-21 Gunnar Wrobel
* kolab.globals.in, rc.kolabd.in: From cvs at kolab.org Mon Aug 23 16:10:08 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 16:10:08 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.574,1.575 Message-ID: <20100823141008.3985360057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv8918 Modified Files: release-notes.txt Log Message: kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.574 retrieving revision 1.575 diff -u -d -r1.574 -r1.575 --- release-notes.txt 23 Aug 2010 13:00:33 -0000 1.574 +++ release-notes.txt 23 Aug 2010 14:10:06 -0000 1.575 @@ -201,6 +201,7 @@ kolab/issue3962 (Names of config variables for "untrusted" text missleading) kolab/issue3979 (improve kolab_ca.sh usability) kolab/issue4311 (Activate port 587 for email submission) + kolab/issue4512 (Allow to hide the admin mail settings in the web admin) - kolab-fbview-1.2.0-2009???? From cvs at kolab.org Mon Aug 23 16:10:42 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 16:10:42 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/templates - New directory Message-ID: <20100823141042.99C6760057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/templates In directory doto:/tmp/cvs-serv9002/templates Log Message: Directory /kolabrepository/server/kolab-webadmin/templates added to the repository From cvs at kolab.org Mon Aug 23 16:10:48 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 16:10:48 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/templates/kolab-webadmin-0 - New directory Message-ID: <20100823141048.1BE4E60057C@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/templates/kolab-webadmin-0 In directory doto:/tmp/cvs-serv9011/templates/kolab-webadmin-0 Log Message: Directory /kolabrepository/server/kolab-webadmin/templates/kolab-webadmin-0 added to the repository From cvs at kolab.org Mon Aug 23 16:28:52 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 16:28:52 +0200 (CEST) Subject: gunnar: server/kolab-webadmin Makefile,1.20,1.21 Message-ID: <20100823142852.9118C60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin In directory doto:/tmp/cvs-serv9224/kolab-webadmin Modified Files: Makefile Log Message: kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile 19 Jan 2010 04:53:26 -0000 1.20 +++ Makefile 23 Aug 2010 14:28:50 -0000 1.21 @@ -9,7 +9,7 @@ test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE) cd $(PACKAGE) && ./bootstrap && ./configure --prefix=/kolab \ && make clean distcheck && mv $(PACKAGE)-$(VERSION).tar.bz2 $(KOLABRPMSRC)/$(PACKAGE) - cp $(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/ + cp $(PACKAGE)/$(PACKAGE).spec templates/kolab-webadmin-0/webadmin.conf.template $(KOLABRPMSRC)/$(PACKAGE)/ cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'kolab_version $(KOLAB_VERSION)' binary: From cvs at kolab.org Mon Aug 23 16:28:52 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 16:28:52 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.575,1.576 Message-ID: <20100823142852.C766E60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv9224 Modified Files: release-notes.txt Log Message: kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.575 retrieving revision 1.576 diff -u -d -r1.575 -r1.576 --- release-notes.txt 23 Aug 2010 14:10:06 -0000 1.575 +++ release-notes.txt 23 Aug 2010 14:28:50 -0000 1.576 @@ -47,6 +47,7 @@ kolab/issue606 (It is not possible to register people with middlename correctly) + kolab/issue991 (Better error message when connecting to sieve fails) kolab/issue1446 (Webinterface for setting vacation, email-delivery and forwarding (rt#5033)) kolab/issue3401 (Change font color of the kolab-webadmin) @@ -56,6 +57,7 @@ in plain text) kolab/issue4510 (Fix the kolab web admin display for Firefox) kolab/issue4511 (Correct the German web admin translation) + kolab/issue4512 (Allow to hide the admin mail settings in the web admin) kolab/issue4515 (Sort some additional lists in the web admin) - Kolab_Config-0.1.0-2010???? @@ -209,11 +211,6 @@ libs in 2.2.1) kolab/issue3439 (FreeBusy display in web client and fbview depends on kolabHomeServer in LDAP) - - - kolab-webadmin-2.?.?-2009???? - - kolab/issue991 (Better error message when connecting to sieve fails) - kolab/issue3401 (Change font color of the kolab-webadmin) - kolab-webclient-1.2.0-2009???? From cvs at kolab.org Mon Aug 23 16:28:52 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 16:28:52 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include config.php.in, 1.3, NONE Message-ID: <20100823142852.D792760057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv9224/kolab-webadmin/kolab-webadmin/php/admin/include Removed Files: config.php.in Log Message: kolab/issue4512 (Allow to hide the admin mail settings in the web admin) --- config.php.in DELETED --- From cvs at kolab.org Mon Aug 23 16:28:53 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 16:28:53 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.131, 1.132 Makefile.am, 1.63, 1.64 kolab-webadmin.spec.in, 1.21, 1.22 Message-ID: <20100823142853.1610260057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv9224/kolab-webadmin/kolab-webadmin Modified Files: ChangeLog Makefile.am kolab-webadmin.spec.in Log Message: kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 --- ChangeLog 23 Aug 2010 13:00:34 -0000 1.131 +++ ChangeLog 23 Aug 2010 14:28:50 -0000 1.132 @@ -1,5 +1,10 @@ 2010-08-23 Gunnar Wrobel
+ * kolab-webadmin.spec: + + Support template based configuration of the web admin. + kolab/issue4512 (Allow to hide the admin mail settings in the web admin) + * php/admin/include/form.class.php: kolab/issue4510 (Fix the kolab web admin display for Firefox) Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- Makefile.am 6 Apr 2010 08:56:32 -0000 1.63 +++ Makefile.am 23 Aug 2010 14:28:50 -0000 1.64 @@ -102,9 +102,6 @@ phpkolabdir = $(phplibdir2)/$(kolab_php_module_prefix)admin -php_includes_configdir = $(phpkolabdir)/include -php_includes_config_DATA = php/admin/include/config.php - PHP_INCLUDES = php/admin/include/menu.php \ php/admin/include/debug.php \ php/admin/include/form.class.php \ @@ -387,12 +384,6 @@ $(do_subst) <$(srcdir)/php/admin/include/auth.class.php.in >$@ CLEANFILES += php/admin/include/auth.class.php EXTRA_DIST += php/admin/include/auth.class.php.in - -php/admin/include/config.php: php/admin/include/config.php.in - $(mkinstalldirs) php/admin/include - $(do_subst) <$(srcdir)/php/admin/include/config.php.in >$@ -CLEANFILES += php/admin/include/config.php -EXTRA_DIST += php/admin/include/config.php.in php/admin/include/headers.php: php/admin/include/headers.php.in @$(mkinstalldirs) php/admin/include Index: kolab-webadmin.spec.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- kolab-webadmin.spec.in 12 Dec 2008 13:33:25 -0000 1.21 +++ kolab-webadmin.spec.in 23 Aug 2010 14:28:50 -0000 1.22 @@ -36,6 +36,7 @@ # list of sources Source0: kolab-webadmin-%{version}.tar.bz2 +Source1: webadmin.conf.template # build information Prefix: %{l_prefix} @@ -61,10 +62,14 @@ ./configure -prefix=%{l_prefix} --with-dist=kolab %install + %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates # install package %{l_make} %{l_mflags} install \ DESTDIR=$RPM_BUILD_ROOT + + %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates # generate file list %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ From cvs at kolab.org Mon Aug 23 16:28:53 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 16:28:53 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/templates/kolab-webadmin-0 webadmin.conf.template, NONE, 1.1 Message-ID: <20100823142853.256EF60057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/templates/kolab-webadmin-0 In directory doto:/tmp/cvs-serv9224/kolab-webadmin/templates/kolab-webadmin-0 Added Files: webadmin.conf.template Log Message: kolab/issue4512 (Allow to hide the admin mail settings in the web admin) --- NEW FILE: webadmin.conf.template --- KOLAB_META_START TARGET=@@@phplibdir2@@@/admin/include/config.php PERMISSIONS=0640 OWNERSHIP=@@@webserver_musr@@@:@@@webserver_grp@@@ KOLAB_META_END * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You can view the GNU General Public License, online, at the GNU * Project's homepage; see . */ $topdir = '/@@@kolab_php_module_prefix@@@admin'; $kolab_prefix = '@@@prefix@@@'; $php_dir = '@@@phplibdir2@@@'; $locale_dir = "$php_dir/@@@kolab_php_module_prefix@@@admin/locale/"; From cvs at kolab.org Mon Aug 23 17:01:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 17:01:28 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.132,1.133 Message-ID: <20100823150128.B016960057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv9741/kolab-webadmin Modified Files: ChangeLog Log Message: Complete kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.132 retrieving revision 1.133 diff -u -d -r1.132 -r1.133 --- ChangeLog 23 Aug 2010 14:28:50 -0000 1.132 +++ ChangeLog 23 Aug 2010 15:01:26 -0000 1.133 @@ -1,6 +1,7 @@ 2010-08-23 Gunnar Wrobel
* kolab-webadmin.spec: + * www/admin/settings/index.php.in: Support template based configuration of the web admin. kolab/issue4512 (Allow to hide the admin mail settings in the web admin) From cvs at kolab.org Mon Aug 23 17:01:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 17:01:28 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/templates/kolab-webadmin-0 webadmin.conf.template, 1.1, 1.2 Message-ID: <20100823150128.B7C4B60057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/templates/kolab-webadmin-0 In directory doto:/tmp/cvs-serv9741/templates/kolab-webadmin-0 Modified Files: webadmin.conf.template Log Message: Complete kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: webadmin.conf.template =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/templates/kolab-webadmin-0/webadmin.conf.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- webadmin.conf.template 23 Aug 2010 14:28:50 -0000 1.1 +++ webadmin.conf.template 23 Aug 2010 15:01:26 -0000 1.2 @@ -29,3 +29,11 @@ $kolab_prefix = '@@@prefix@@@'; $php_dir = '@@@phplibdir2@@@'; $locale_dir = "$php_dir/@@@kolab_php_module_prefix@@@admin/locale/"; + + +/** + * Hide section administrative email addresses (hostmaster at ..., postmaster at ...) + * in the "Settings" section. + */ +define('HIDE_ADMINISTRATIVE_EMAILSETTINGS', false); + From cvs at kolab.org Mon Aug 23 17:01:28 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 17:01:28 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/settings index.php.in, 1.4, 1.5 Message-ID: <20100823150128.B3A2060057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/settings In directory doto:/tmp/cvs-serv9741/kolab-webadmin/www/admin/settings Modified Files: index.php.in Log Message: Complete kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: index.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/settings/index.php.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- index.php.in 23 Aug 2010 09:04:55 -0000 1.4 +++ index.php.in 23 Aug 2010 15:01:26 -0000 1.5 @@ -317,7 +317,10 @@ $systemaliasconf = array(); -if( $auth->group() == 'admin' ) { +// Section administrative email addresses may be hidden by +// setting HIDE_ADMINISTRATIVE_EMAILSETTINGS to 'true' in +// php/admin/include/conf.php +if( $auth->group() == 'admin' && !HIDE_ADMINISTRATIVE_EMAILSETTINGS) { $domain_count = 0; foreach( $ldap->domains() as $domain ) { if( !exists_group( 'hostmaster@'.$domain ) || From cvs at kolab.org Mon Aug 23 17:10:42 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 17:10:42 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.133,1.134 Message-ID: <20100823151042.EEDE160057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv10194/kolab-webadmin Modified Files: ChangeLog Log Message: Complete kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.133 retrieving revision 1.134 diff -u -d -r1.133 -r1.134 --- ChangeLog 23 Aug 2010 15:01:26 -0000 1.133 +++ ChangeLog 23 Aug 2010 15:10:40 -0000 1.134 @@ -1,6 +1,7 @@ 2010-08-23 Gunnar Wrobel
* kolab-webadmin.spec: + * www/admin/index.php.in: * www/admin/settings/index.php.in: Support template based configuration of the web admin. From cvs at kolab.org Mon Aug 23 17:10:43 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 17:10:43 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin index.php.in, 1.4, 1.5 Message-ID: <20100823151043.15F2860057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin In directory doto:/tmp/cvs-serv10194/kolab-webadmin/www/admin Modified Files: index.php.in Log Message: Complete kolab/issue4512 (Allow to hide the admin mail settings in the web admin) Index: index.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/index.php.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- index.php.in 25 Jan 2007 10:33:42 -0000 1.4 +++ index.php.in 23 Aug 2010 15:10:40 -0000 1.5 @@ -39,11 +39,12 @@ if( $auth->group() == 'admin' ) { $domains = $ldap->domains(); foreach( $domains as $domain ) { - if( !exists_group( 'hostmaster@'.$domain ) || - !exists_group( 'postmaster@'.$domain ) || - !exists_group( 'abuse@'.$domain ) || - !exists_group( 'virusalert@'.$domain ) || - !exists_group( 'MAILER-DAEMON@'.$domain ) ) { + if( (!exists_group( 'hostmaster@'.$domain ) || + !exists_group( 'postmaster@'.$domain ) || + !exists_group( 'abuse@'.$domain ) || + !exists_group( 'virusalert@'.$domain ) || + !exists_group( 'MAILER-DAEMON@'.$domain )) + && !HIDE_ADMINISTRATIVE_EMAILSETTINGS) { // Ok, user did not set up system aliases $maincontent = 'systemaliasnagscreen.tpl'; } From cvs at kolab.org Mon Aug 23 19:13:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:13:47 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer maintainer.php.in, 1.12, 1.13 Message-ID: <20100823171347.3B48A600580@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer In directory doto:/tmp/cvs-serv12394/kolab-webadmin/kolab-webadmin/www/admin/maintainer Modified Files: maintainer.php.in Log Message: kolab/issue4516 (Various logic/spelling fixes for the web admin) Index: maintainer.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- maintainer.php.in 12 Jul 2010 21:22:09 -0000 1.12 +++ maintainer.php.in 23 Aug 2010 17:13:44 -0000 1.13 @@ -176,6 +176,8 @@ if( $form->isSubmitted() ) { if( !$form->validate() ) { $form->setValues(); + if ($action != "firstsave") + fill_form_for_modify( $form, $ldap_object ); $content = $form->outputForm(); } else { debug("Process..."); From cvs at kolab.org Mon Aug 23 19:13:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:13:46 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/administrator admin.php.in, 1.10, 1.11 Message-ID: <20100823171346.A4A0360057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator In directory doto:/tmp/cvs-serv12394/kolab-webadmin/kolab-webadmin/www/admin/administrator Modified Files: admin.php.in Log Message: kolab/issue4516 (Various logic/spelling fixes for the web admin) Index: admin.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- admin.php.in 12 Jul 2010 21:22:09 -0000 1.10 +++ admin.php.in 23 Aug 2010 17:13:44 -0000 1.11 @@ -179,6 +179,7 @@ if( $form->isSubmitted() ) { if( !$form->validate() ) { $form->setValues(); + if ($action != "firstsave") fill_form_for_modify( $form, $ldap_object ); $content = $form->outputForm(); } else { debug("Process..."); @@ -246,6 +247,7 @@ $form->entries['password_0']['value'] = ''; $form->entries['password_1']['value'] = ''; $form->entries['action']['value'] = 'save'; + $form->entries['uid']['attrs'] = 'readonly'; $content = $form->outputForm(); break; } else { From cvs at kolab.org Mon Aug 23 19:13:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:13:46 +0200 (CEST) Subject: gunnar: server release-notes.txt,1.576,1.577 Message-ID: <20100823171346.A0E2960057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server In directory doto:/tmp/cvs-serv12394 Modified Files: release-notes.txt Log Message: kolab/issue4516 (Various logic/spelling fixes for the web admin) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.576 retrieving revision 1.577 diff -u -d -r1.576 -r1.577 --- release-notes.txt 23 Aug 2010 14:28:50 -0000 1.576 +++ release-notes.txt 23 Aug 2010 17:13:44 -0000 1.577 @@ -59,6 +59,7 @@ kolab/issue4511 (Correct the German web admin translation) kolab/issue4512 (Allow to hide the admin mail settings in the web admin) kolab/issue4515 (Sort some additional lists in the web admin) + kolab/issue4516 (Various logic/spelling fixes for the web admin) - Kolab_Config-0.1.0-2010???? From cvs at kolab.org Mon Aug 23 19:13:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:13:46 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php.in, 1.5, 1.6 Message-ID: <20100823171346.AAF7360057F@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist In directory doto:/tmp/cvs-serv12394/kolab-webadmin/kolab-webadmin/www/admin/distributionlist Modified Files: list.php.in Log Message: kolab/issue4516 (Various logic/spelling fixes for the web admin) Index: list.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- list.php.in 11 Jan 2010 09:30:11 -0000 1.5 +++ list.php.in 23 Aug 2010 17:13:44 -0000 1.6 @@ -76,6 +76,8 @@ if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0]; else $cn = $ldap_object['cn']; $form->entries['cn']['value'] = $cn; + if ($_REQUEST['action'] != "firstsave") + $form->entries['cn']['attrs'] = "readonly"; $form->entries['action']['value'] = 'save'; $m = $ldap_object['member']; @@ -88,7 +90,8 @@ debug("internaldn=\"$internaldn\""); debug("dn=\"$dn\""); debug("substr=\"".substr( $dn, strlen($dn)-strlen( $internaldn ) )."\""); - if( substr( $dn, strlen($dn)-strlen( $internaldn ) ) === $internaldn ) { + if( substr( $dn, strlen($dn)-strlen( $internaldn ) ) === $internaldn + || preg_match("/cn=internal/",$dn) ) { $form->entries['hidden']['value'] = true; } else { $form->entries['hidden']['value'] = false; @@ -146,10 +149,11 @@ $content = $form->outputForm(); break; case 'firstsave': - $form->entries['cn']['validation'] = 'checkuniquemail'; + $form->entries['cn']['validation'] = array('notempty', 'checkuniquemail'); case 'save': if( $form->isSubmitted() ) { if( !$form->validate() ) { + fill_form_for_modify( $form, $ldap_object ); $form->setValues(); $content = $form->outputForm(); } else { From cvs at kolab.org Mon Aug 23 19:13:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:13:46 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.134,1.135 Message-ID: <20100823171346.A56FE60057D@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv12394/kolab-webadmin/kolab-webadmin Modified Files: ChangeLog Log Message: kolab/issue4516 (Various logic/spelling fixes for the web admin) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- ChangeLog 23 Aug 2010 15:10:40 -0000 1.134 +++ ChangeLog 23 Aug 2010 17:13:44 -0000 1.135 @@ -1,5 +1,15 @@ 2010-08-23 Gunnar Wrobel
+ * lib/KolabAdmin/Ldap.php: + * www/admin/administrator/admin.php.in: + * www/admin/distributionlist/list.php.in: + * www/admin/domainmaintainer/domainmaintainer.php.in: + * www/admin/maintainer/maintainer.php.in: + * www/admin/sharedfolder/sf.php.in: + * www/admin/user/user.php.in: + + kolab/issue4516 (Various logic/spelling fixes for the web admin) + * kolab-webadmin.spec: * www/admin/index.php.in: * www/admin/settings/index.php.in: From cvs at kolab.org Mon Aug 23 19:13:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:13:46 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer domainmaintainer.php.in, 1.17, 1.18 Message-ID: <20100823171346.E3A4960057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer In directory doto:/tmp/cvs-serv12394/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer Modified Files: domainmaintainer.php.in Log Message: kolab/issue4516 (Various logic/spelling fixes for the web admin) Index: domainmaintainer.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- domainmaintainer.php.in 12 Jul 2010 21:22:09 -0000 1.17 +++ domainmaintainer.php.in 23 Aug 2010 17:13:44 -0000 1.18 @@ -163,6 +163,8 @@ if( $form->isSubmitted() ) { if( !$form->validate() ) { $form->setValues(); + if ($action != "firstsave") + fill_form_for_modify($form, $ldap_object); $content = $form->outputForm(); } else { $ldap_object = array(); From cvs at kolab.org Mon Aug 23 19:13:46 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:13:46 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Ldap.php, 1.4, 1.5 Message-ID: <20100823171346.A69CE60057E@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin In directory doto:/tmp/cvs-serv12394/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Modified Files: Ldap.php Log Message: kolab/issue4516 (Various logic/spelling fixes for the web admin) Index: Ldap.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Ldap.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Ldap.php 23 Aug 2010 09:04:55 -0000 1.4 +++ Ldap.php 23 Aug 2010 17:13:44 -0000 1.5 @@ -507,6 +507,7 @@ } } } + return true; } // Set deleflag on object, or if $delete_now is From cvs at kolab.org Mon Aug 23 19:13:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:13:47 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder sf.php.in, 1.11, 1.12 Message-ID: <20100823171347.7D3ED60057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder In directory doto:/tmp/cvs-serv12394/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder Modified Files: sf.php.in Log Message: kolab/issue4516 (Various logic/spelling fixes for the web admin) Index: sf.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- sf.php.in 11 Jan 2010 09:30:11 -0000 1.11 +++ sf.php.in 23 Aug 2010 17:13:45 -0000 1.12 @@ -31,6 +31,7 @@ if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0]; else $cn = $ldap_object['cn']; $form->entries['cn']['value'] = $cn; + $form->entries['cn']['attrs'] = 'readonly'; if( in_array('cyrus-userquota',$ldap_object)) { if (is_array($ldap_object['cyrus-userquota'])) $userquota = $ldap_object['cyrus-userquota'][0]; @@ -40,6 +41,7 @@ if (is_array($ldap_object['kolabHomeServer'])) $kolabhomeserver = $ldap_object['kolabHomeServer'][0]; $form->entries['kolabhomeserver']['value'] = $kolabhomeserver; + $form->entries['kolabhomeserver']['attrs'] = 'readonly'; if( in_array('kolabFolderType',$ldap_object)) { if (is_array($ldap_object['kolabFolderType'])) @@ -162,6 +164,8 @@ case 'save': if( $form->isSubmitted() ) { if( !$form->validate() ) { + if($action != "firstsave") + fill_form_for_modify($form, $ldap_object); $form->setValues(); $content = $form->outputForm(); } else { From cvs at kolab.org Mon Aug 23 19:13:47 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:13:47 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.33, 1.34 Message-ID: <20100823171347.A9A6E60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv12394/kolab-webadmin/kolab-webadmin/www/admin/user Modified Files: user.php.in Log Message: kolab/issue4516 (Various logic/spelling fixes for the web admin) Index: user.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- user.php.in 12 Jul 2010 21:22:09 -0000 1.33 +++ user.php.in 23 Aug 2010 17:13:45 -0000 1.34 @@ -108,7 +108,7 @@ $ok = true; } } - if(!$ok) return sprintf(_("Email address %1\$s not in domains %2\$s"), $value, join(", ", $domain)); + if(!$ok) return sprintf(_("Email address %1\$s not in domains %2\$s"), $value, join(", ", $domains)); if( $ldap->countMail( $_SESSION['base_dn'], $value ) > 0 ) { return _('User, vCard or distribution list with this email address already exists'); @@ -553,7 +553,7 @@ apply_attributeaccess( $entries ); } $form =& new KolabForm( 'user', 'createuser.tpl', $entries ); -/***************** Main action swicth **********************/ +/***************** Main action switch **********************/ switch( $action ) { case 'firstsave': debug("adding checkuniquemail to validation"); @@ -562,6 +562,8 @@ case 'save': if( $form->isSubmitted() ) { if( !$form->validate() ) { + if($action != "firstsave") + fill_form_for_modify($form, $ldap_object); $form->setValues(); $content = $form->outputForm(); } else { @@ -819,7 +821,7 @@ $heading = _('Create New User'); $blacklist = array('mail'); $form->entries['action']['value'] = 'firstsave'; - $form->outputForm(); + $content = $form->outputForm(); break; } } From cvs at kolab.org Mon Aug 23 19:30:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:30:54 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/kolab-webadmin kolab-webadmin.spec.in, 1.22, 1.23 Message-ID: <20100823173054.79BCB60057A@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv12689/kolab-webadmin Modified Files: kolab-webadmin.spec.in Log Message: Mark the new template as configuration file. Index: kolab-webadmin.spec.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- kolab-webadmin.spec.in 23 Aug 2010 14:28:50 -0000 1.22 +++ kolab-webadmin.spec.in 23 Aug 2010 17:30:52 -0000 1.23 @@ -73,6 +73,7 @@ # generate file list %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ + '%config %{l_prefix}/etc/kolab/templates/webadmin.conf.template' \ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/php/admin/templates_c %files -f files From cvs at kolab.org Mon Aug 23 19:30:54 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 23 Aug 2010 19:30:54 +0200 (CEST) Subject: gunnar: server/kolab-webadmin/templates/kolab-webadmin-0 webadmin.conf.template, 1.2, 1.3 Message-ID: <20100823173054.7BC0160057B@lists.intevation.de> Author: gunnar Update of /kolabrepository/server/kolab-webadmin/templates/kolab-webadmin-0 In directory doto:/tmp/cvs-serv12689/templates/kolab-webadmin-0 Modified Files: webadmin.conf.template Log Message: Mark the new template as configuration file. Index: webadmin.conf.template =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/templates/kolab-webadmin-0/webadmin.conf.template,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- webadmin.conf.template 23 Aug 2010 15:01:26 -0000 1.2 +++ webadmin.conf.template 23 Aug 2010 17:30:52 -0000 1.3 @@ -36,4 +36,3 @@ * in the "Settings" section. */ define('HIDE_ADMINISTRATIVE_EMAILSETTINGS', false); - From cvs at kolab.org Mon Sep 6 13:14:43 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 6 Sep 2010 13:14:43 +0200 (CEST) Subject: thomas: CVSROOT config,1.1,1.2 Message-ID: <20100906111443.4EB43600568@lists.intevation.de> Author: thomas Update of /kolabrepository/CVSROOT In directory doto:/tmp/cvs-serv16105 Modified Files: config Log Message: Preparations for making server module read-only Index: config =================================================================== RCS file: /kolabrepository/CVSROOT/config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- config 4 Oct 2002 16:34:14 -0000 1.1 +++ config 6 Sep 2010 11:14:40 -0000 1.2 @@ -1,8 +1,8 @@ # Set this to "no" if pserver shouldn't check system users/passwords -#SystemAuth=no +SystemAuth=no # Put CVS lock files in this directory rather than directly in the repository. -#LockDir=/var/lock/cvs +LockDir=/var/lock/cvs/kolab # Set `TopLevelAdmin' to `yes' to create a CVS directory at the top # level of the new working directory when using the `cvs checkout' From cvs at kolab.org Mon Sep 6 15:36:50 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 6 Sep 2010 15:36:50 +0200 (CEST) Subject: thomas: doc/www/src mercurial.html.m4, NONE, 1.1 Makefile, 1.25, 1.26 cvs-kolab.html.m4, 1.15, 1.16 footer.html.m4, 1.47, 1.48 howto-kolab.html.m4, 1.3, 1.4 index.html.m4, 1.174, 1.175 kolabsearch.htm, 1.11, 1.12 Message-ID: <20100906133650.EA541600568@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv25601 Modified Files: Makefile cvs-kolab.html.m4 footer.html.m4 howto-kolab.html.m4 index.html.m4 kolabsearch.htm Added Files: mercurial.html.m4 Log Message: Adjust web page for server development with Mercurial --- NEW FILE: mercurial.html.m4 --- m4_define(`PAGE_TITLE', `Mercurial repositories for Kolab') m4_include(header.html.m4)
This page was updated on:
$Date: 2010/09/06 13:36:48 $
Mercurial SCM
The Kolab project maintains a Mercurial server for version control of the Kolab server code.
Please report any development issues to the Kolab development mailing list. Please feel free to submit patches, documentation or anything else you can think of that would help the project.
Web access and anonymous clone
http://hg.kolab.org/ allows browsing all Mercurial repositories. The Kolab Server development repository can be cloned via http:
hg clone http://hg.kolab.org/server
If you want to update your local clone, you can use:
hg pull -u
Further usage information for Mercurial can be found on the Learn Mercurial page.
push access for developers
hg clone ssh://hg at hg.kolab.org/server (edit something) hg add foobar # add new files hg commit # commit your changes hg outgoing -vp # show what would be pushed hg push # publish your changes
RSA key fingerprint of hg.kolab.org is a7:43:54:ab:bc:55:3f:05:76:30:59:67:7f:2c:df:df.
Branches

default
Like HEAD in CVS or master in git; this branch is open for development.
To checkout use: hg checkout default

2.2-stable
This is the current status of Kolab 2.2.x and is mainly used for bugfixes.
To checkout use: hg checkout 2.2-stable

Other Branches
There are many more branches, mainly of historic intrest and mostly inactive. To discover them all one can have a look at the branches page of the server repository.

m4_include(footer.html.m4) Index: Makefile =================================================================== RCS file: /kolabrepository/doc/www/src/Makefile,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Makefile 21 Apr 2008 09:35:44 -0000 1.25 +++ Makefile 6 Sep 2010 13:36:48 -0000 1.26 @@ -10,12 +10,13 @@ howtos.html \ mirrors.html \ cvs-kolab.html \ + mercurial.html \ kolab2-clients.html \ client-features.html \ kolab-plugins.html \ kolabsearch.html \ documentation.html \ - olddocumentation.html \ + olddocumentation.html \ i18n.html \ webclient.html Index: cvs-kolab.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/cvs-kolab.html.m4,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- cvs-kolab.html.m4 26 Mar 2010 11:44:14 -0000 1.15 +++ cvs-kolab.html.m4 6 Sep 2010 13:36:48 -0000 1.16 @@ -1,12 +1,13 @@ -m4_define(`PAGE_TITLE', `Server Development') +m4_define(`PAGE_TITLE', `Kolab CVS repository') m4_include(header.html.m4)
This page was updated on:
$Date$
CVS
-The Kolab project maintains a CVS server for version control of the Kolab -server code. +The Kolab project maintains a CVS server for version control of Kolab +documentation and this web site. Server development already moved to +Mercurial, the remaining files will follow.
Please report any development issues to the @@ -33,32 +34,10 @@
Main Modules - server: The Kolab Server + server: The Kolab Server (read-only) doc: Documentation utils: Various utilities

- -
Branches
- -
-
Kolab-2 Development
- Also known as HEAD; this branch is open for development.
- To checkout use : cvs checkout -
-
-
Kolab-2.2 Stable
- This is the current status of Kolab 2.2.x and is mainly used for bugfixes.
- To checkout use : cvs checkout -r kolab_2_2_branch modulename -
-
-
Other Branches
- There are many more branches, mainly of historic intrest and mostly inactive. - To discover them all one can have a look at the "Show files using tag:" menu - at the button of the servers - view-cvs page. -
-
-
m4_include(footer.html.m4) Index: footer.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/footer.html.m4,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- footer.html.m4 2 Mar 2010 15:21:41 -0000 1.47 +++ footer.html.m4 6 Sep 2010 13:36:48 -0000 1.48 @@ -86,7 +86,7 @@ Archive | Subscribe/Manage
-CVS Commit Mailinglist: +Kolab Commits Mailinglist:
Archive | Subscribe/Manage @@ -95,6 +95,9 @@ Browse CVS
Testing-Utilities in CVS
+Mercurial SCM | +Browse +

Index: howto-kolab.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/howto-kolab.html.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- howto-kolab.html.m4 10 Jun 2004 22:48:34 -0000 1.3 +++ howto-kolab.html.m4 6 Sep 2010 13:36:48 -0000 1.4 @@ -6,8 +6,7 @@ »$2 ',`$2')') -
The following instructions are aimed at the technical advanced -administrator. +
The following instructions are outdated!
Install current Kolab Server release
Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.174 retrieving revision 1.175 diff -u -d -r1.174 -r1.175 --- index.html.m4 1 Jul 2010 13:35:02 -0000 1.174 +++ index.html.m4 6 Sep 2010 13:36:48 -0000 1.175 @@ -59,6 +59,23 @@

+ + +
September 6th, 2010 » + Kolab Server development switched to Mercurial SCM +
+
+ Kolab Server development switched from CVS to the distributed SCM + Mercurial. The repositories are + available at hg.kolab.org, which is + operated by Kolab Systems. + For details look at the instructions for using + Mercurial for Kolab Server development.
+
+
+ + +

July 1st, 2010 » Kolab Server 2.2.4 Final Release Index: kolabsearch.htm =================================================================== RCS file: /kolabrepository/doc/www/src/kolabsearch.htm,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- kolabsearch.htm 2 Mar 2010 15:21:41 -0000 1.11 +++ kolabsearch.htm 6 Sep 2010 13:36:48 -0000 1.12 @@ -564,13 +564,18 @@ Archive | Subscribe/Manage
-CVS Commit Mailinglist: +Kolab Commits Mailinglist:
Archive | Subscribe/Manage

-Kolab Server Development
+CVS | Browse CVS +
+Testing-Utilities in CVS
+Mercurial SCM | +Browse +
From hg at kolab.org Mon Sep 6 16:05:40 2010 From: hg at kolab.org (hg@kolab.org) Date: Mon, 6 Sep 2010 16:05:40 +0200 Subject: server@4637: new changeset (1 on 2.2-stable) Message-ID: <201009061405.o86E5ei0018583@app01.kolabsys.com> New changeset (1 on 2.2-stable) in server: pushed by: wilde at intevation.de http://hg.kolab.org/server/rev/82733a4020a0 changeset: 4637:82733a4020a0 branch: 2.2-stable tag: tip parent: 4609:4d36e00ab66f user: Sascha Wilde date: Mon Sep 06 16:04:50 2010 +0200 summary: Replaced all cvsignore files with one fresh hgignore file. -- Repository URL: http://hg.kolab.org/server From hg at kolab.org Mon Sep 6 16:14:17 2010 From: hg at kolab.org (hg@kolab.org) Date: Mon, 6 Sep 2010 16:14:17 +0200 Subject: server@4638: new changeset Message-ID: <201009061414.o86EEHdJ019313@app01.kolabsys.com> New changeset in server: pushed by: wilde at intevation.de http://hg.kolab.org/server/rev/b291c29ca994 changeset: 4638:b291c29ca994 tag: tip parent: 4636:f430a067132b user: Sascha Wilde date: Mon Sep 06 16:04:50 2010 +0200 summary: Replaced all cvsignore files with one fresh hgignore file. -- Repository URL: http://hg.kolab.org/server From hg at kolab.org Mon Sep 6 15:45:02 2010 From: hg at kolab.org (hg@kolab.org) Date: Mon, 6 Sep 2010 15:45:02 +0200 Subject: server@4636: 4637 new changesets (61 on 1.0-stable, 1 on 1.x-stable, 171 on 2.0-stable, 43 on 2.1-stable, 36 on 2.2-feature-suc, 255 on 2.2-stable) Message-ID: <201009061345.o86Dj2sd015836@app01.kolabsys.com> 4637 new changesets (61 on 1.0-stable, 1 on 1.x-stable, 171 on 2.0-stable, 43 on 2.1-stable, 36 on 2.2-feature-suc, 255 on 2.2-stable) in server: pushed by: thomas at intevation.de changeset: 0:f865cf118184 user: Tassilo Erlewein date: Tue Nov 12 23:19:52 2002 +0100 summary: *** empty log message *** ... 4635 changesets not listed ... changeset: 4636:f430a067132b tag: tip user: cvs2hg date: Mon Sep 06 15:41:02 2010 +0200 summary: convert CVS tags -- Repository URL: http://hg.kolab.org/server From cvs at kolab.org Mon Sep 6 20:57:10 2010 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 6 Sep 2010 20:57:10 +0200 (CEST) Subject: thomas: doc/www/src i18n.html.m4,1.6,1.7 Message-ID: <20100906185710.CDDC1600568@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv31156 Modified Files: i18n.html.m4 Log Message: Fix kolab/issue4527 (Error on http://kolab.org/i18n.html) Index: i18n.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/i18n.html.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- i18n.html.m4 11 Jun 2008 15:20:39 -0000 1.6 +++ i18n.html.m4 6 Sep 2010 18:57:07 -0000 1.7 @@ -6,8 +6,8 @@
Kolab Server: Webadmin
-The web administration interface of the Kolab Server -offers localisation support since Kolab2. +The web administration interface of the Kolab Server +offers localisation support since Kolab2. Translations can be done easily. Kolab Server 2.2 comes with the following activated translations: @@ -16,9 +16,9 @@
Deutsch
English
Fran�ais -
N�erlandais
Italiano -
Spanish +
Nederlands +
Espa�ol Translations for other languages are welcome! @@ -28,22 +28,22 @@ Kontact has good support for about 30 languages, with more then 30 additional languages in progress. -The languages listed above for the Webadmin are usually +The languages listed above for the Webadmin are usually most uptodate for the client.
-The KDE Kolab Client profits from +The KDE Kolab Client profits from KDE's internationalisation team, -as the efforts of the Kolab project on the KDE side have directly -been done within KDE. +as the efforts of the Kolab project on the KDE side have directly +been done within KDE.
Outlook with proprietary plugins
-Most of ther user interface will come from Outlook itself -and thus available in -all languages that Outlook supports. +Most of the user interface will come from Outlook itself, thus +all languages that Outlook supports +are available.
-The plugins itself do not contain many texts, but they are at least +The plugins themselves do not contain many texts, but they are at least available in German and English. m4_include(footer.html.m4)