gunnar: server/perl-kolab AUTHORS, 1.4, 1.5 ChangeLog, 1.39, 1.40 MANIFEST, 1.4, 1.5 Makefile.PL, 1.7, 1.8 perl-kolab.spec, 1.102, 1.103

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv20319

Modified Files:
	AUTHORS ChangeLog MANIFEST Makefile.PL perl-kolab.spec 
Log Message:
Merge all perl tools into the perl-kolab package.

Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/perl-kolab/AUTHORS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- AUTHORS	6 Feb 2008 13:06:32 -0000	1.4
+++ AUTHORS	10 Oct 2008 14:22:03 -0000	1.5
@@ -8,11 +8,11 @@
   (c) 2003         Tassilo Erlewein     <tassilo.erlewein at erfrakon.de>
   (c) 2003         Achim Frank          <achim.frank at erfrakon.de>
   (c) 2004         Stephan Buys         <s.buys at codefusion.co.za>
-  (c) 2005 - 2006  Richard Bos          <richard at radoeka.nl>
-  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
+  (c) 2005 - 2008  Richard Bos          <richard at radoeka.nl>
+  (c) 2005 - 2008  Marcus Hüwe          <suse-tux at gmx.de>
   (c) 2004 - 2006  Steffen Hansen       <steffen at klaralvdalens-datakonsult.se>
   (c) 2007 - 2008  Thomas Arendsen Hein <thomas at intevation.de>
-  (c) 2006 - 2007  Gunnar Wrobel        <wrobel at pardus.de>
+  (c) 2006 - 2008  Gunnar Wrobel        <wrobel at pardus.de>
   (c) 2003 - 2007  Martin Konold        <martin.konold at erfrakon.de>
 
 
@@ -20,7 +20,7 @@
 
   (c) 2004 - 2006  Klaraelvdalens Datakonsult AB
   (c) 2007 - 2008  Intevation GmbH
-  (c) 2006 - 2007  p at rdus
+  (c) 2006 - 2008  p at rdus
   (c) 2003 - 2007  erfrakon Partnerschaftsgesellschaft
 
 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ChangeLog	14 Aug 2008 19:17:42 -0000	1.39
+++ ChangeLog	10 Oct 2008 14:22:03 -0000	1.40
@@ -1,10 +1,79 @@
+2008-10-03  Gunnar Wrobel  <p at rdus.de>
+
+	* bin/kolabquotawarn.in: Moved script from kolabd package into
+	perl-kolab.
+
+	* bin/kolabpasswd.in: Moved script from kolabd package into
+	perl-kolab.
+
+	* bin/kolab_bootstrap.in: Moved script from kolabd package into
+	perl-kolab.
+
+	* bin/kolabd.in: Moved script from kolabd package into
+	perl-kolab.
+
+	* bin/kolabcheckperm.in: Moved script from kolabd package into
+	perl-kolab.
+
+	* bin/kolabquotareport.in: Moved script from kolabd package into
+	perl-kolab.
+
+	* bin/kolab_smtpdpolicy.in: Moved script from kolabd package into
+	perl-kolab.
+
+	* Makefile.PL: Added routines for script installations.
+
+2008-09-09 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: updated to improve readability
+
+2008-09-08 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: added code to include warnings in a configuration
+	  file, by replacing the macro @@@warning@@@ in the config file.
+	  See kolab/issue1671
+
+2008-09-06 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm:
+	  - changed if {}; if {}, etc into if {}; elsif {}, etc.
+	    Added a warning for incorrect keys in the META section
+	    of a template file.
+	  - Added support to define the comment character in the
+	    META part of a template file
+
+2008-09-01 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: allow different spacing (multiple spaces or tabs)
+	  instead of only 1 space in the @@@if conditionals.
+
+2008-08-29 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: added code to support the conditional:
+	  @@@if exists( /full/path/to/file )@@@ as proposed by Thomas in
+	  kolab/issue3006
+
+2008-08-27 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: removed code specific for slapd.conf
+	  See kolab/issue3005
+
+2008-08-20 Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Conf.pm: added function bootstrapConfig to create config
+	  files needed during kolab bootstrapping, see kolab/issue1755
+
 2008-08-14  Richard Bos <richard at radoeka.nl>
 
-	* lib/Kolab.pm: add syncrepl support, see kolab/issue1755 
+	* lib/Kolab.pm: add syncrepl support, see kolab/issue1755
+
+2008-08-09 Richard Bos <richard at radoeka.nl>
+
+	* Kolab-Conf/Conf.pm.in: added syncrepl support (see kolab/issue1755)
 
 2008-07-17  Richard Bos <richard at radoeka.nl>
 
-	* lib/Kolab/LDAP/Backend/syncrepl.pm: add kolab/issue1755 
+	* lib/Kolab/LDAP/Backend/syncrepl.pm: add kolab/issue1755
 	* MANIFEST: added the file lib/Kolab/LDAP/Backend/syncrepl.pm
 	* lib/Kolab.pm: added supported backend types
 
@@ -66,6 +135,28 @@
 	* lib/Kolab/LDAP.pm: Fix synchronization of mailboxes with newer perl.
 	kolab/issue2411 (perl error in LDAP.pm)
 
+2008-01-07  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* bin/kolabconf.in: Added missing newlines in kolabconf -h.
+
+2008-01-02  Marcus Hüwe   <suse-tux at gmx.de>
+
+	* Makefile.PL:
+
+	Fixed build for older versions of ExtUtils::MakeMaker.
+
+2008-01-01  Marcus Hüwe   <suse-tux at gmx.de>
+
+	* bin/kolabconf.in:
+
+	Removed superfluous print statement.
+
+2007-12-07  Gunnar Wrobel  <p at rdus.de>
+
+	* Makefile.PL (MY::postamble):
+
+	Fix the install location for kolabconf for the newest MakeMaker.
+
 2007-11-28  Gunnar Wrobel  <p at rdus.de>
 
 	* lib/Kolab/LDAP.pm (syncDomains, createObject):
@@ -85,8 +176,32 @@
 
 	* lib/Kolab.pm: kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
 
+	* lib/Kolab/Conf.pm: kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
+
+2007-09-06  Gunnar Wrobel  <p at rdus.de>
+
+	* Conf.pm:
+
+	Allowed config variable replacement within the META section of
+	the templates. This reduces our dependence on the dist_conf
+	mechanism and we can use variables from kolab.globals
+	instead. Now add on packages can install their own templates.
+
+	Whitespace cleanup.
+
+2007-08-07  Gunnar Wrobel  <p at rdus.de>
+
+	* Conf.pm:
+
+	Fixed kolab/issue1879 (kolabconf poor error message in buildCyrusConfig)
+	https://intevation.de/roundup/kolab/issue1879
+
 2007-08-01    Gunnar Wrobel  <p at rdus.de>
 
+	Created the kolabconf package by moving kolabconf and the
+	Conf.pm perl module into one package. The package is now a
+	clean perl package.
+
 	Converted the perl-kolab package into a standard perl library.
 
 2007-07-31    Gunnar Wrobel  <p at rdus.de>
@@ -136,12 +251,24 @@
 
 	* Makefile.am: added Makefile dependencies
 
+2007-01-06 Joergen Fjeld <jhf at linpro.no>
+
+	* Kolab-Conf/Conf.pm.in (build):
+
+	Patch applied by Martin Konold:
+
+	- fixes order of domains see also https://intevation.de/roundup/kolab/issue1550
+
 2006-12-04  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* Kolab-Conf/Conf.pm.in (build): Only print "No configuration
 	variable corresponding to `$1' exists" in case we are NOT skipping
 	the section.
 
+	* Kolab-Conf/Conf.pm.in (build): Only print "No configuration
+	variable corresponding to `$1' exists" in case we are NOT skipping
+	the section.
+
 2006-03-20 Marcus Hüwe <suse-tux at gmx.de>
 	Patch commited by Richard Bos
 	* Kolab-Conf/Conf.pm.in: introduce a new variable phpinit_dir for the
@@ -157,6 +284,8 @@
 	  Added dist_conf file check.  If dist_conf file specified with
 	  --with-dist is not present fail configure.
 	* perl-kolab.spec.in: replaced --enable-dist with --with-dist
+	* Kolab-Conf/Conf.pm.in: introduce a new variable phpinit_dir for the
+	  directory that holds the php.ini file to be used.
 
 2006-01-14 Richard Bos <richard at radoeka.nl>
 	* Kolab/Kolab.pm.in: check for valid uid/gid values with perl define
@@ -248,4 +377,3 @@
 	  Kolab-LDAP-Backend-slurpd/Makefile.PL,
 	  Kolab-DirServ/Makefile.PL,
 	  Kolab-LDAP-Backend-dirservd/Makefile.PL: are removed
-	

Index: MANIFEST
===================================================================
RCS file: /kolabrepository/server/perl-kolab/MANIFEST,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MANIFEST	17 Jul 2008 09:12:59 -0000	1.4
+++ MANIFEST	10 Oct 2008 14:22:03 -0000	1.5
@@ -1,7 +1,19 @@
 AUTHORS
 ChangeLog
 INSTALL
+bin/kolab_bootstrap.in
+bin/kolabcheckperm.in
+bin/kolabconf.in
+bin/kolabdcachetool.in
+bin/kolabd.in
+bin/kolabpasswd.in
+bin/kolabquotareport.in
+bin/kolabquotawarn.in
+bin/kolab_smtpdpolicy.in
+bin/kolab_upgrade.in
+data/quotawarning.txt
 lib/Kolab.pm
+lib/Kolab/Conf.pm
 lib/Kolab/Cyrus.pm
 lib/Kolab/LDAP.pm
 lib/Kolab/LDAP/Backend.pm

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.PL	13 Sep 2007 10:05:49 -0000	1.7
+++ Makefile.PL	10 Oct 2008 14:22:03 -0000	1.8
@@ -5,6 +5,38 @@
 use ExtUtils::MakeMaker;
 use Getopt::Long;
 
+my $HELP = 0;
+my $CONFIG = '/kolab/etc/kolab';
+my $INSTALLSCRIPT = '/kolab/bin';
+
+GetOptions(
+    "config=s" => \$CONFIG,
+    "bin=s" => \$INSTALLSCRIPT,
+    "help" => \$HELP
+    );
+
+if ($HELP) {
+  print <<'EOH';
+Usage: perl Makefile.PL [--config CONFIG_DIR] [--bin BIN_DIR] --help
+
+Option config
+
+  to specify the path to the kolab configuration directory. The
+  default is /kolab/etc/kolab/ but this may vary depending on your
+  installation.
+
+Option bin
+
+  to specify the path to the directory where scripts should be installed.
+
+Option help
+
+  to get this text.
+
+EOH
+exit 0;
+}
+
 # Add the dist_openpkg target to the dist target
 sub MY::dist {
     package MY;   # To help SUPER work right
@@ -37,7 +69,9 @@
 
 sub MY::postamble {
     
-    my $add = "
+    my $add = "bin/%: bin/%.in
+	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#' > \$@
+
 ifeq \"x\$(RPM)\" \"x\"
   RPM = \$(HOME)/bin/openpkg rpm
 endif
@@ -86,10 +120,29 @@
 use lib "lib";
 require "Kolab.pm";
 
+# older versions of ExtUtils:MakeMaker don't support INSTALLVENDORSCRIPT
+my $installscript = "";
+if ($ExtUtils::MakeMaker::VERSION >= 6.42) {
+    $installscript = "INSTALLVENDORSCRIPT";
+} else {
+    $installscript = "INSTALLSCRIPT";
+}
+
 WriteMakefile(
     NAME              => 'perl-kolab',
     VERSION           => $Kolab::VERSION,
     INSTALLDIRS       => 'vendor',
+    EXE_FILES         => [ 'bin/kolab_smtpdpolicy',
+                           'bin/kolabquotareport',
+                           'bin/kolabcheckperm',
+                           'bin/kolabconf',
+                           'bin/kolabdcachetool',
+                           'bin/kolabd',
+                           'bin/kolab_bootstrap',
+                           'bin/kolabpasswd',
+                           'bin/kolabquotawarn',
+                           'bin/kolab_upgrade',],
+    $installscript    => $INSTALLSCRIPT,
     ABSTRACT          => 
 'perl-kolab provides a basic set of perl modules required for the
 Kolab Groupware server.',

Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- perl-kolab.spec	12 Oct 2007 16:30:35 -0000	1.102
+++ perl-kolab.spec	10 Oct 2008 14:22:03 -0000	1.103
@@ -72,8 +72,16 @@
 
 %install
     %{l_prefix}/bin/perl-openpkg prepare
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE0} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE0}  -A "--config \"%{l_prefix}/etc/kolab\" --bin \"%{l_prefix}/bin\"" configure build install
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
+    mkdir -p $RPM_BUILD_ROOT/%{l_prefix}/sbin
+    mv $RPM_BUILD_ROOT/%{l_prefix}/bin/kolabd $RPM_BUILD_ROOT/%{l_prefix}/sbin/kolabd
+    mv $RPM_BUILD_ROOT/%{l_prefix}/bin/kolabcheckperm $RPM_BUILD_ROOT/%{l_prefix}/sbin/kolabcheckperm
+    chmod 744 $RPM_BUILD_ROOT/%{l_prefix}/sbin/kolabd
+    chmod 744 $RPM_BUILD_ROOT/%{l_prefix}/sbin/kolabcheckperm
+    mkdir -p $RPM_BUILD_ROOT/%{l_prefix}/etc/kolab
+    cp $RPM_BUILD_DIR/%{V_package}-%{V_version}/%{V_package}-%{V_source_tag}/data/quotawarning.txt $RPM_BUILD_ROOT/%{l_prefix}/etc/kolab
+    sed -i -e 's#/bin/kolabd#/sbin/kolabd#' -e 's#/bin/kolabcheckperm#/sbin/kolabcheckperm#' perl-openpkg-files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`
 
 %files -f files