thomas: server/kolabd/kolabd ChangeLog, 1.110, 1.111 Makefile.am, 1.34, 1.35 kolab.globals.in, 1.8, 1.9 kolab2.schema, 1.26, 1.27 kolab_bootstrap.in, 1.27, 1.28 kolabd.spec.in, 1.20, 1.21
cvs at kolab.org
cvs at kolab.org
Wed Oct 17 19:57:15 CEST 2007
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv9800/kolabd/kolabd
Modified Files:
ChangeLog Makefile.am kolab.globals.in kolab2.schema
kolab_bootstrap.in kolabd.spec.in
Log Message:
Fix kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- ChangeLog 3 Oct 2007 10:05:18 -0000 1.110
+++ ChangeLog 17 Oct 2007 17:57:13 -0000 1.111
@@ -1,3 +1,14 @@
+2007-10-17 Thomas Arendsen Hein <thomas at intevation.de>
+
+ * Makefile.am, kolab.globals.in, kolab2.schema, kolab_bootstrap.in,
+ kolabd.spec.in, dist_conf/centos-clarkconnect, dist_conf/common,
+ dist_conf/debian, dist_conf/gentoo, dist_conf/kolab,
+ dist_conf/mandriva, dist_conf/suse, namespace/libexec/showlog.in,
+ templates/rc.conf.template.in:
+ kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
+
+ * templates/proftpd.conf.template.in: Removed.
+
2007-10-03 Gunnar Wrobel <p at rdus.de>
* templates/httpd.conf.template.in:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile.am 3 Oct 2007 10:05:18 -0000 1.34
+++ Makefile.am 17 Oct 2007 17:57:13 -0000 1.35
@@ -63,7 +63,6 @@
templates/ldapvirtual.cf.template \
templates/kolab_smtpdpolicy.conf.template \
templates/php.ini.template \
- templates/proftpd.conf.template \
templates/resmgr.conf.template \
templates/saslauthd.conf.template \
templates/session_vars.php.template \
@@ -444,12 +443,6 @@
$(do_subst) <$(srcdir)/templates/php.ini.template.in >$@
CLEANFILES += templates/php.ini.template
EXTRA_DIST += templates/php.ini.template.in
-
-templates/proftpd.conf.template: templates/proftpd.conf.template.in
- @$(mkinstalldirs) templates
- $(do_subst) <$(srcdir)/templates/proftpd.conf.template.in >$@
-CLEANFILES += templates/proftpd.conf.template
-EXTRA_DIST += templates/proftpd.conf.template.in
templates/rc.conf.template: templates/rc.conf.template.in
@$(mkinstalldirs) templates
Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab.globals.in 8 Oct 2007 15:39:27 -0000 1.8
+++ kolab.globals.in 17 Oct 2007 17:57:13 -0000 1.9
@@ -12,8 +12,6 @@
log_level : 2
debug : 0
postfix-mydestination : $mydomain
-proftpd-ftp : FALSE
-proftpd-userPassword :
sf_field_deleted : kolabdeleteflag
sf_field_guid : entryUUID
sf_field_modified : modifytimestamp
@@ -42,7 +40,6 @@
kolabdir: @sysconfdir@/kolab/
postmapping: @sbindir@/postmap -o @emailserver_confdir@
KOLABRC: @KOLABRC@
-ftpserver_pidfile: @ftpserver_pidfile@
sbindir: @sbindir@
webserver_logdir: @webserver_logdir@
webserver_document_root: @webserver_document_root@
Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- kolab2.schema 25 Sep 2007 16:37:10 -0000 1.26
+++ kolab2.schema 17 Oct 2007 17:57:13 -0000 1.27
@@ -521,9 +521,9 @@
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-######################
-# proftpd attributes #
-######################
+######################################################
+# proftpd attributes (unused since Kolab Server 2.2) #
+######################################################
attributetype ( 1.3.6.1.4.1.19414.2.1.901
NAME 'proftpd-defaultquota'
Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- kolab_bootstrap.in 8 Oct 2007 15:21:20 -0000 1.27
+++ kolab_bootstrap.in 17 Oct 2007 17:57:13 -0000 1.28
@@ -536,9 +536,6 @@
'cyrus-sieve' => "TRUE",
'apache-http' => "FALSE",
'apache-allow-unauthenticated-fb' => "FALSE",
- 'proftpd-ftp' => "FALSE",
- #'proftpd-defaultquota' => 100000,
- #'proftpd-userPassword' => "freebusy",
'uid' => "freebusy",
'userPassword' => "freebusy",
'objectclass' => ['top', 'kolab' ] );
@@ -632,7 +629,7 @@
print "LDAP setup finished\n\n";
- print "Create initial config files for postfix, apache, proftpd, cyrus imap, saslauthd\n";
+ print "Create initial config files for postfix, apache, cyrus imap, saslauthd\n";
if ("@WITHOPENPKG@" eq "yes") {
# @sysconfdir@/rc.conf can be used to change the startup behaviour
Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- kolabd.spec.in 14 Oct 2007 12:31:58 -0000 1.20
+++ kolabd.spec.in 17 Oct 2007 17:57:13 -0000 1.21
@@ -73,7 +73,6 @@
%endif
PreReq: imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes
-PreReq: proftpd, proftpd::with_ldap = yes
PreReq: perl-ssl
PreReq: perl-www
PreReq: perl-ldap
More information about the commits
mailing list