Index: kolabd/ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.6 diff -a -u -r1.6 ChangeLog --- kolabd/ChangeLog 9 Dec 2005 16:02:16 -0000 1.6 +++ kolabd/ChangeLog 9 Dec 2005 22:02:19 -0000 @@ -1,3 +1,29 @@ +2005-12-11 Richard Bos + * 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 and AUTHORS to the document files to be + distributed. + - 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@ + 2005-12-09 Bernhard Herzog * templates/slapd.conf.template.in (require): For some reason, the Index: kolabd/Makefile.am =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v retrieving revision 1.5 diff -a -u -r1.5 Makefile.am --- kolabd/Makefile.am 5 Dec 2005 16:21:34 -0000 1.5 +++ kolabd/Makefile.am 9 Dec 2005 22:02:19 -0000 @@ -111,17 +111,19 @@ 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 \ + NEWS \ + AUTHORS -kolabdocdir = $(datadir)/kolab/doc +kolabdocdir = $(pkgdocdir)/kolabd dist_kolabdoc_DATA = $(kolabdoc_FILES) -kolabsbin_FILES = kolabd \ +kolabsbin_FILES = kolabd \ kolabconf \ kolabcheckperm @@ -136,13 +138,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 +438,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: kolabd/kolab_bootstrap.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v retrieving revision 1.8 diff -a -u -r1.8 kolab_bootstrap.in --- kolabd/kolab_bootstrap.in 27 Nov 2005 23:57:02 -0000 1.8 +++ kolabd/kolab_bootstrap.in 9 Dec 2005 22:02:20 -0000 @@ -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,7 @@ ."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` ) { + 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; Index: kolabd/kolabquotawarn.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v retrieving revision 1.5 diff -a -u -r1.5 kolabquotawarn.in --- kolabd/kolabquotawarn.in 27 Nov 2005 23:57:02 -0000 1.5 +++ kolabd/kolabquotawarn.in 9 Dec 2005 22:02:22 -0000 @@ -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: kolabd/rc.kolabd.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/rc.kolabd.in,v retrieving revision 1.1 diff -a -u -r1.1 rc.kolabd.in --- kolabd/rc.kolabd.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolabd/rc.kolabd.in 9 Dec 2005 22:02:22 -0000 @@ -1,4 +1,4 @@ -#!@prefix@/lib/openpkg/bash @sysconfdir@/rc +#!@BASH@ @sysconfdir@/rc ## ## rc.kolabd -- Run-Commands ## Index: kolabd/dist_conf/kolab =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v retrieving revision 1.5 diff -a -u -r1.5 kolab --- kolabd/dist_conf/kolab 5 Dec 2005 16:21:34 -0000 1.5 +++ kolabd/dist_conf/kolab 9 Dec 2005 22:02:22 -0000 @@ -19,11 +19,15 @@ # @l_susr@ kolab_susr=root -kolab_rcdir=${sysconfdir}/rc.d - BASH=${libdir}/openpkg/bash PERL=${bindir}/perl PHP=${bindir}/php + +kolab_rcdir=${sysconfdir}/rc.d +pkgdocdir=${datadir}/doc + +# /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/" +perllib=${libdir}/perl/vendor_perl/5.8.5 amavisd_confdir=${sysconfdir}/amavisd amavisd_logfile=${localstatedir}/amavisd/amavis.log Index: kolabd/doc/README.amavisd.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/doc/README.amavisd.in,v retrieving revision 1.1 diff -a -u -r1.1 README.amavisd.in --- kolabd/doc/README.amavisd.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolabd/doc/README.amavisd.in 9 Dec 2005 22:02:22 -0000 @@ -26,7 +26,7 @@ containing the virus if it had not been infected. Any infected email that is blocked from reaching it's recipient is -archived to @l_prefix@/var/amavisd/virusmails on the server. +archived to @localstatedir@/amavisd/virusmails on the server. Spam-handling is different: Spam is not blocked by the filter, but instead email potentially is spam is marked with the @@ -50,7 +50,7 @@ @viruses_that_fake_sender_maps = (); $warnvirusrecip = 1; # (defaults to false (undef)) $warnbannedrecip = 1; # (defaults to false (undef)) -$QUARANTINEDIR = '@l_prefix@/var/amavisd/virusmails'; +$QUARANTINEDIR = '@localstatedir@/amavisd/virusmails'; $virus_quarantine_to = 'virus-quarantine'; @mynetworks = qw( @@@postfix-mynetworks@@@ ); @@ -90,4 +90,4 @@ [3] http://spamassassin.apache.org/ [4] See http://www.kolab.org/ [5] A "local user" is a user with an email-account on the kolab -server, a "non-local user" is everyone else. \ No newline at end of file +server, a "non-local user" is everyone else. Index: kolabd/doc/README.webgui.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/doc/README.webgui.in,v retrieving revision 1.1 diff -a -u -r1.1 README.webgui.in --- kolabd/doc/README.webgui.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolabd/doc/README.webgui.in 9 Dec 2005 22:02:22 -0000 @@ -25,7 +25,7 @@ user. The right are the same as "admin". By default all classes can use the webgui. By changing -@l_prefix@/etc/kolab/templates/session_vars.php this can be +@sysconfdir@/kolab/templates/session_vars.php this can be configured. The user-classes that shold have access to the webgui are listed in the $params['allow_user_classes'] array: @@ -37,7 +37,7 @@ user's account object. If it possible to change which LDAP attributes are shown to users on the user page. For each attribute in the user form, an entry in the array $params['attribute_access'] in -@l_prefix@/etc/kolab/templates/session_vars.php can be made. The key +@sysconfdir@/kolab/templates/session_vars.php can be made. The key of the entry is the attribute's name and the value is one of "ro": Readonly. @@ -57,4 +57,4 @@ $param['attribute_access'] = array( 'title' => 'ro', 'telephoneNumber' => 'ro', - 'c' => 'hidden' ); \ No newline at end of file + 'c' => 'hidden' ); Index: kolabd/namespace/libexec/showlog.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/showlog.in,v retrieving revision 1.2 diff -a -u -r1.2 showlog.in --- kolabd/namespace/libexec/showlog.in 22 Nov 2005 14:21:58 -0000 1.2 +++ kolabd/namespace/libexec/showlog.in 9 Dec 2005 22:02:23 -0000 @@ -14,9 +14,6 @@ ## Project's homepage; see . ## -# can be removed (i think) won't be needed -# prefix=@prefix@ - if [ ".$1" = ".--showhelp" ]; then echo "Display the Kolab server logs" exit 0