gunnar: server/kolabd/kolabd ChangeLog, 1.136, 1.137 Makefile.am, 1.36, 1.37
cvs at kolab.org
cvs at kolab.org
Wed Feb 6 09:00:29 CET 2008
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv20882/kolabd/kolabd
Modified Files:
ChangeLog Makefile.am
Log Message:
Second draft version of the generatefb script (issue kolab/issue1693). Should be split into a bash script and web callable script now.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- ChangeLog 1 Feb 2008 19:12:26 -0000 1.136
+++ ChangeLog 6 Feb 2008 08:00:27 -0000 1.137
@@ -1,8 +1,18 @@
+2008-02-06 Gunnar Wrobel <p at rdus.de>
+
+ * Makefile.am (namespace/libexec/generatefb):
+
+ Add the new namespace script.
+
+ * namespace/libexec/generatefb.in:
+
+ Add a bash script for calling the new generatefb.php script
+
2008-02-01 Richard Bos <richard at radoeka.nl>
* dist_conf/kolabsrv.in: changed the reference to the script itself
to an autotools variable (@KOLABRC@).
-2008-01-31 Marcus Hüwe <suse-tux at gmx.de>
+2008-01-31 Marcus Hüwe <suse-tux at gmx.de>
* dist_conf/kolabsrv.in: added getServiceName method to map distribution
specific rc script names.
* dist_conf/suse: updated logfile locations + other fixes (now support for
@@ -118,7 +128,7 @@
kolab/issue2236 (Apache UID access broken)
-2007-11-07 Marcus Hüwe <suse-tux at gmx.de>
+2007-11-07 Marcus Hüwe <suse-tux at gmx.de>
* dist_conf/suse:
changed the location of the resmgr_confdir
@@ -131,7 +141,7 @@
Added webserver_tmpdir
-2007-10-22 Marcus Hüwe <suse-tux at gmx.de>
+2007-10-22 Marcus Hüwe <suse-tux at gmx.de>
* dist_conf/suse:
changed the location of the smtpd.conf file (sasl_smtpconffile)
@@ -293,21 +303,21 @@
configuration and "postfix upgrade-configuration" adds a missing
"discard" service. Added to the template.
-2007-06-27 Marcus Hüwe <suse-tux at gmx.de>
+2007-06-27 Marcus Hüwe <suse-tux at gmx.de>
* dist_conf/suse:
The emailserver_socket is stored in $(libexecdir) and not in $(libdir). This
fixes a x86_64 issue.
-2007-06-22 Marcus Hüwe <suse-tux at gmx.de>
+2007-06-22 Marcus Hüwe <suse-tux at gmx.de>
* Makefile.am, dirservnotify, dirservupdate:
autoconfiscated dirservnotify and dirservupdate. "dirservnotify" was renamed
to "dirservnotify.in" and "dirservupdate" was renamed to "dirservupdate.in".
-2007-06-21 Marcus Hüwe <suse-tux at gmx.de>
+2007-06-21 Marcus Hüwe <suse-tux at gmx.de>
* Makefile.am:
@@ -376,7 +386,7 @@
Should fix
issue1609 (https://intevation.de/roundup/kolab/issue1609)
-2007-03-22 Marcus Hüwe <suse-tux at gmx.de>
+2007-03-22 Marcus Hüwe <suse-tux at gmx.de>
* templates/main.cf.template.in:
@@ -391,7 +401,7 @@
the kolabconf log. Resolves:
kolab/issue1638 (https://intevation.de/roundup/kolab/issue1638)
-2007-02-11 Marcus Hüwe <suse-tux at gmx.de>
+2007-02-11 Marcus Hüwe <suse-tux at gmx.de>
* dist_conf/suse, dist_conf/kolab/, dist_conf/common,
dist_conf/gentoo: Added new variable TAR
* kolab_bootstrap.in: Added a condition to the slave setup so that
@@ -445,7 +455,7 @@
order to get the correct path under all distributions.
-2006-10-02 Marcus Hüwe <suse-tux at gmx.de>
+2006-10-02 Marcus Hüwe <suse-tux at gmx.de>
* templates/slapd.conf.template.in: fixed issue1426 - thanks
Gunnar!
@@ -491,7 +501,7 @@
in Postfix 2.2), everything else is cleanup or commented out by
default.
-2006-04-13 Marcus Hüwe <suse-tux at gmx.de>
+2006-04-13 Marcus Hüwe <suse-tux at gmx.de>
* templates/master.cf.template.in: replaced @bindir@/php with @PHP@
* dist_conf/suse: changed the location for the ldapserver_argsfile,
ldapserver_pidfile and ldapserverslurpd_pidfile
@@ -501,7 +511,7 @@
engine uses a real /freebusy directory on the filesystem before
%{DOCUMENT_ROOT}/freebusy. This may result in unexpected behaviour.
-2006-04-03 Marcus Hüwe <suse-tux at gmx.de>
+2006-04-03 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* dist_conf/common, dist_conf/kolab, dist_conf/suse,
templates/freebusy.conf.template.in: introduction of freebusy_usr
@@ -511,7 +521,7 @@
* templates/php.ini.template.in: use the variable phpini_dir instead
of webserver_confdir.
-2006-03-26 Marcus Hüwe <suse-tux at gmx.de>
+2006-03-26 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* dist_conf/{common,suse,kolab}, templates/main.cf.template.in:
Introduced new variable @aliases_file@
@@ -520,13 +530,13 @@
* dist_conf/suse, dist_conf/kolab provide the correct values for
the resmgr_scriptsdir variable.
-2006-03-20 Marcus Hüwe <suse-tux at gmx.de>
+2006-03-20 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* dist_conf/common, dist_conf/kolab, dist_conf/suse,
templates/master.cf.template.in: introduce a new variable phpini_dir
for the directory that holds the php.ini file to be used.
-2006-03-16 Marcus Hüwe <suse-tux at gmx.de>
+2006-03-16 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* dist_conf/suse: run as user kolab instead of nobody.
@@ -538,7 +548,7 @@
In the old location the directory was not writable by the ldap
daemon, in the new location /var/run/slapd/ it is.
-2006-03-02 Marcus Hüwe <suse-tux at gmx.de>
+2006-03-02 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* dist_conf/common, dist_conf/kolab, dist_conf/suse,
kolab_bootstrap.in, kolab_sslcert.sh.in: introduced a new
@@ -548,7 +558,7 @@
* dist_conf/kolab: Use amavisd.log instead of amavis.log as log file
to fix logrotate in OpenPKG installation (Issue1015).
-2006-02-06 Marcus Hüwe <suse-tux at gmx.de>
+2006-02-06 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* Makefile.am: create the kolab_statedir directory, during make.
@@ -575,7 +585,7 @@
kolab-n and kolab-r!
See https://intevation.de/roundup/kolab/issue1083
-2006-02-01 Marcus Hüwe <suse-tux at gmx.de>
+2006-02-01 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* dist_conf/common,
dist_conf/kolab,
@@ -588,7 +598,7 @@
@amavisd_logfile@, see tracker:
https://intevation.de/roundup/kolab/issue1088
-2006-01-31 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-31 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* dist_conf/common,
dist_conf/kolab,
@@ -613,7 +623,7 @@
emailserver_default_privs and emailserver_master_usr
Remove variable emailserver_mail_usr, it is not used anymore
-2006-01-17 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-17 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* dist_conf/{common,kolab,suse}: introduced *_rpm variables and
ldapserver_rgrp variable.
@@ -632,7 +642,7 @@
* templates/session_vars.php.template.in: use @webserver_musr@ instead
of @kolab_musr@
-2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* dist_conf/common,
dist_conf/kolab,
@@ -662,7 +672,7 @@
use the real value 'kolab-r' instead
* kolab_sslcert.sh.in: replace restricted_kolab_grp with kolab_rgrp
-2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* configure.ac: replaced --enable-dist with --with-dist
Added dist_conf file check. If dist_conf file specified with
@@ -717,13 +727,13 @@
kolabd's Makefile.am is updated for dist_conf sources.
Added a distclean-local rule to remove the directory autom4te.cache
-2006-01-02 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-02 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* Makefile.am: changed kolabrc_FILE into kolabrc_DATA to fix
bug issue1068; rc.kolabd need to be executable
Thanks Marcus for providing the fix.
-2006-01-01 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-01 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos, see issue1049
* dist_conf/debian: added (provided by Benoit Mortier)
* dist_conf/suse, dist_conf/kolab, dist_conf/common: added backupdir
@@ -741,14 +751,14 @@
* dist_conf/suse: adjusted freebusy_cachedir to reflect the
addition of webserver_web_prefix
-2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
+2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos, see issue1049
* templates/resmgr.conf.template.in,
templates/fbview.conf.template.in: added
@webserver_web_prefix@ (we did what Mandriva already had done!)
* dist_conf/{kolab,suse,common}: added @webserver_web_prefix@
-2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
+2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos, see issue1047
* dist_conf/{kolab,suse}: added KOLABRC variable
* kolab_bootstrap.in: replaced @bindir@/openpkg with @KOLABRC@
@@ -793,7 +803,7 @@
* Makefile.am: make kolabpasswd executable for non OPENPKG distributions
as well
-2005-12-22 Marcus Hüwe <suse-tux at gmx.de>
+2005-12-22 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* dist_conf/suse: changed perllib from site_perl to vendor_perl
changed pkgdocdir from ${datadir}/doc/packages to
@@ -810,7 +820,7 @@
that the variable BASH does not get updated in configure, as it is
already set by bash itself....)
-2005-12-18 Marcus Hüwe <suse-tux at gmx.de>
+2005-12-18 Marcus Hüwe <suse-tux at gmx.de>
Patch committed by Richard Bos
* Makefile.am: removed redundant prefix dist_
Removed commented out lines
@@ -818,7 +828,7 @@
2005-12-17 Richard Bos <richard at radoeka.nl>
* dist_conf/common: added @ftpserver_pidfile@
-2005-12-17 Richard Bos <richard at radoeka.nl> and Marcus Hüwe <suse-tux at gmx.de>
+2005-12-17 Richard Bos <richard at radoeka.nl> and Marcus Hüwe <suse-tux at gmx.de>
* configure.ac: added --enable/--disable-openpkg configure options,
by default openpkg is enabled. When disabled, the files kolab,
namespace/kolab and rc.kolabd are not distributed as they are
@@ -912,7 +922,7 @@
in phplibdir2
* Makefile.am: added kolab_upgrade
-2005-11-27 Marcus Hüwe <suse-tux at gmx.de>
+2005-11-27 Marcus Hüwe <suse-tux at gmx.de>
* dist_conf/common: altered bash_exec, perl_exec to respectively:
BASH and PERL.
Added: PHP, freebusy_cachefile and resmgr_filter in preparation for
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile.am 7 Nov 2007 10:37:53 -0000 1.36
+++ Makefile.am 6 Feb 2008 08:00:27 -0000 1.37
@@ -85,6 +85,7 @@
kolabnamespace_FILES = namespace/libexec/newconfig \
namespace/libexec/adduser \
namespace/libexec/deluser \
+ namespace/libexec/generatefb \
namespace/libexec/listusers \
namespace/libexec/showuser \
namespace/libexec/newconfig \
@@ -267,6 +268,13 @@
chmod a+x namespace/libexec/deluser
CLEANFILES += namespace/libexec/deluser
EXTRA_DIST += namespace/libexec/deluser.in
+
+namespace/libexec/generatefb: namespace/libexec/generatefb.in
+ @$(mkinstalldirs) namespace/libexec
+ $(do_subst) <$(srcdir)/namespace/libexec/generatefb.in >$@
+ chmod a+x namespace/libexec/generatefb
+CLEANFILES += namespace/libexec/generatefb
+EXTRA_DIST += namespace/libexec/generatefb.in
namespace/libexec/listusers: namespace/libexec/listusers.in
@$(mkinstalldirs) namespace/libexec
More information about the commits
mailing list