richard: server/kolabd/kolabd AUTHORS, NONE, 1.1 NEWS, NONE, 1.1 ChangeLog, 1.6, 1.7 Makefile.am, 1.5, 1.6 bootstrap, 1.1, 1.2 kolab_bootstrap.in, 1.8, 1.9 kolabquotawarn.in, 1.5, 1.6 rc.kolabd.in, 1.1, 1.2
cvs at intevation.de
cvs at intevation.de
Sat Dec 10 22:57:13 CET 2005
Author: richard
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv13859
Modified Files:
ChangeLog Makefile.am bootstrap kolab_bootstrap.in
kolabquotawarn.in rc.kolabd.in
Added Files:
AUTHORS NEWS
Log Message:
https://intevation.de/roundup/kolab/issue1021
* Makefile.am: fixed a typo: templtes should be templates
- kolabdocdir was not using the dist_conf file. It is now, and the
documentation directory can be defined with: pkgdocdir
- kolabrcdir was not using the dist_conf file. It is now, and the
rc directory can be defined with: kolab_rcdir
- Added ChangeLog, NEWS, COPYING and AUTHORS to the document files
to be distributed.
- INSTALL will be included in the tarbal
- Changed the document path to $(pkgdocdir)/kolabd (that is
../share/kolab/doc, to .../share/doc/kolabd. To prevent classes
with files named the same (e.g. ChangeLog) from other modules.
* dist-conf/kolab: added pkgdocdir to reflect the change in Makefile.am
- Added perllib
* kolab_bootstrap.in: use the '[x]' trick to prevent grep to show
in the process list...
* kolabquotawarn.in: removed unnecessary prefix assignment
* doc/README.amavisd.in: replace @l_prefix@/var by the autotools prefix
variable @localstatedir@
* doc/README.webgui.in: replace @l_prefix@/etc by the autotools prefix
variable @sysconfdir@
* namespace/libexec/showlog.in: removed commented out prefix
assignment. It is really not needed anymore
* kolab_bootstrap.in: removed redundant kolab_prefix assigment
replaced $kolab_prefix/bin by @bindir@
* rc.kolabd.in: @prefix@/lib/openpkg/bash replaced by @BASH@
* NEWS: added
* AUTHORS: added
* bootstrap: removed touching of the files: NEWS, ChangeLog and
AUTHORS, as they are now in CVS
--- NEW FILE: AUTHORS ---
Marcus Huwe and Richard Bos autoconfiscated kolabd
--- NEW FILE: NEWS ---
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog 9 Dec 2005 16:02:16 -0000 1.6
+++ ChangeLog 10 Dec 2005 21:57:11 -0000 1.7
@@ -1,3 +1,34 @@
+2005-12-11 Richard Bos <richard at radoeka.nl>
+ * Makefile.am: fixed a typo: templtes should be templates
+ - kolabdocdir was not using the dist_conf file. It is now, and the
+ documentation directory can be defined with: pkgdocdir
+ - kolabrcdir was not using the dist_conf file. It is now, and the
+ rc directory can be defined with: kolab_rcdir
+ - Added ChangeLog, NEWS, COPYING and AUTHORS to the document files
+ to be distributed.
+ - INSTALL will be included in the tarbal
+ - Changed the document path to $(pkgdocdir)/kolabd (that is
+ ../share/kolab/doc, to .../share/doc/kolabd. To prevent classes
+ with files named the same (e.g. ChangeLog) from other modules.
+ * dist-conf/kolab: added pkgdocdir to reflect the change in Makefile.am
+ - Added perllib
+ * kolab_bootstrap.in: use the '[x]' trick to prevent grep to show
+ in the process list...
+ * kolabquotawarn.in: removed unnecessary prefix assignment
+ * doc/README.amavisd.in: replace @l_prefix@/var by the autotools prefix
+ variable @localstatedir@
+ * doc/README.webgui.in: replace @l_prefix@/etc by the autotools prefix
+ variable @sysconfdir@
+ * namespace/libexec/showlog.in: removed commented out prefix
+ assignment. It is really not needed anymore
+ * kolab_bootstrap.in: removed redundant kolab_prefix assigment
+ replaced $kolab_prefix/bin by @bindir@
+ * rc.kolabd.in: @prefix@/lib/openpkg/bash replaced by @BASH@
+ * NEWS: added
+ * AUTHORS: added
+ * bootstrap: removed touching of the files: NEWS, ChangeLog and
+ AUTHORS, as they are now in CVS
+
2005-12-09 Bernhard Herzog <bh at intevation.de>
* templates/slapd.conf.template.in (require): For some reason, the
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am 5 Dec 2005 16:21:34 -0000 1.5
+++ Makefile.am 10 Dec 2005 21:57:11 -0000 1.6
@@ -111,17 +111,21 @@
amavisddedir = $(amavisd_confdir)/templates/de
dist_amavisdde_DATA = $(amavisdde_FILES)
-
kolabdoc_FILES = doc/README.amavisd \
doc/README.ldapdelete \
doc/README.outlook \
doc/README.sieve \
- doc/README.webgui
+ doc/README.webgui \
+ ChangeLog \
+ COPYING \
+ NEWS \
+ AUTHORS
-kolabdocdir = $(datadir)/kolab/doc
+kolabdocdir = $(pkgdocdir)/kolabd
dist_kolabdoc_DATA = $(kolabdoc_FILES)
+EXTRA_DIST += INSTALL
-kolabsbin_FILES = kolabd \
+kolabsbin_FILES = kolabd \
kolabconf \
kolabcheckperm
@@ -136,13 +140,8 @@
kolabbindir = $(bindir)
dist_kolabbin_DATA = $(kolabbin_FILE)
-
-kolabrc_FILE = rc.kolabd
-
-# that works - but $(rcdir) not :/
-kolabrcdir = $(sysconfdir)/rc.d
-
-dist_kolabrc_DATA = $(kolabrc_FILE)
+kolabrcdir = $(kolab_rcdir)
+dist_kolabrc_DATA = rc.kolabd
#srcdir = .
@@ -441,7 +440,7 @@
EXTRA_DIST += templates/slapd.access.template.in
templates/slapd.conf.template:
- @$(mkinstalldirs) templtes
+ @$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/slapd.conf.template.in >$@
CLEANFILES += templates/slapd.conf.template
EXTRA_DIST += templates/slapd.conf.template.in
Index: bootstrap
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/bootstrap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bootstrap 13 Sep 2005 14:38:22 -0000 1.1
+++ bootstrap 10 Dec 2005 21:57:11 -0000 1.2
@@ -1,4 +1,3 @@
-touch NEWS README AUTHORS ChangeLog
-#cp -R ../../perl-kolab/dist_conf .
+touch README
autoreconf -f -i
Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab_bootstrap.in 27 Nov 2005 23:57:02 -0000 1.8
+++ kolab_bootstrap.in 10 Dec 2005 21:57:11 -0000 1.9
@@ -27,7 +27,6 @@
use Time::Local;
use Time::localtime;
-my $kolab_prefix = "@prefix@";
my $kolab_config = "@sysconfdir@/kolab/kolab.conf";
my %kolab_config;
@@ -91,7 +90,7 @@
print ("Error: Found $name running on Port $port\n");
print ("Check your installation!\n");
print ("You must stop the service $name before running Kolab\n");
- print ("You may try to execute \"$kolab_prefix/bin/openpkg rc all stop\" initially\n");
+ print ("You may try to execute \"@bindir@/openpkg rc all stop\" initially\n");
exit 1;
}
}
@@ -395,7 +394,8 @@
."Please stop any running ldap server and bootstrap again\n";
tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n"
."Please stop any running kolabd and bootstrap again\n";
- if( `ps -elf|grep slurpd|grep -v grep` ) {
+ # 051210: the check below used to be: if( `ps -elf|grep slurpd|grep -v grep` ) \rbos
+ if( `ps -elf|grep s[l]urpd` ) {
print "Error: Detected running slurpd processes.\n";
print "Please make sure the OpenLDAP server is stopped properly!\n";
exit 1;
@@ -708,7 +708,8 @@
."Please stop any running ldap server and bootstrap again\n";
tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n"
."Please stop any running kolabd and bootstrap again\n";
- if( `ps -elf|grep slurpd|grep -v grep` ) {
+ # 051210: the check below used to be: if( `ps -elf|grep slurpd|grep -v grep` ) \rbos
+ if( `ps -elf|grep s[l]urpd` ) {
print "WARNING: Detected running slurpd processes.\n";
print " Please make sure the OpenLDAP server is stopped properly!\n";
}
Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabquotawarn.in 27 Nov 2005 23:57:02 -0000 1.5
+++ kolabquotawarn.in 10 Dec 2005 21:57:11 -0000 1.6
@@ -90,7 +90,6 @@
}
my $verbose = 0;
-my $prefix = $Kolab::config{'prefix'};
my $warninterval = 60*60*24; # seconds between warnings
my $warnmessage = '';
my $quotawarnpct = $Kolab::config{'cyrus-quotawarn'};
Index: rc.kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/rc.kolabd.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rc.kolabd.in 13 Sep 2005 14:38:22 -0000 1.1
+++ rc.kolabd.in 10 Dec 2005 21:57:11 -0000 1.2
@@ -1,4 +1,4 @@
-#!@prefix@/lib/openpkg/bash @sysconfdir@/rc
+#!@BASH@ @sysconfdir@/rc
##
## rc.kolabd -- Run-Commands
##
More information about the commits
mailing list