[pkg-kolab] r1552 - in libkolab-perl/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2011-05-24 21:47:51 +0000 (Tue, 24 May 2011)
New Revision: 1552

Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/patches/30-bootstrap.diff
Log:
30-bootstrap.diff refreshed

Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog	2011-05-24 21:36:35 UTC (rev 1551)
+++ libkolab-perl/trunk/debian/changelog	2011-05-24 21:47:51 UTC (rev 1552)
@@ -3,6 +3,7 @@
   * New release 2.3.1 (20101212)
     - 10-invoke-rc.diff removed, reworked upstream: we now use kolabsrv from
       the kolabd package
+    - 30-bootstrap.diff refreshed
   * removed unused quilt dependency 
   * Drop old Breaks/Replaces on kolabconf, kolabd (no more in oldstable=lenny) 
   * Updated Standards-Version to 3.9.2: no changes

Modified: libkolab-perl/trunk/debian/patches/30-bootstrap.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/30-bootstrap.diff	2011-05-24 21:36:35 UTC (rev 1551)
+++ libkolab-perl/trunk/debian/patches/30-bootstrap.diff	2011-05-24 21:47:51 UTC (rev 1552)
@@ -4,23 +4,14 @@
 
 Upstream status: Parts can be or have been included
 
-Index: b/sbin/kolab_bootstrap.in
+Index: libkolab-perl-2.3+git-20101212/sbin/kolab_bootstrap.in
 ===================================================================
---- a/sbin/kolab_bootstrap.in
-+++ b/sbin/kolab_bootstrap.in
-@@ -221,7 +221,7 @@
+--- libkolab-perl-2.3+git-20101212.orig/sbin/kolab_bootstrap.in	2010-11-25 10:42:40.000000000 +0100
++++ libkolab-perl-2.3+git-20101212/sbin/kolab_bootstrap.in	2011-05-24 23:43:34.000000000 +0200
+@@ -376,6 +376,18 @@
  
- print ("Excellent all required Ports are available!\n");
+ $Kolab::config{"is_master"} = $is_master;
  
--system("$Kolab::config{'sbindir'}/slapcat >/dev/null 2>&1");
-+system("su  --shell /bin/sh --command $Kolab::config{'sbindir'}/slapcat >/dev/null 2>&1");
- if ($?==0) {
-   print ("\nFound existing configuration\n");
-   print "\nBootstrapping Kolab will overwrite old configuration\n";
-@@ -320,6 +320,18 @@
-   print "Proceeding with master server setup\n\n";
- }
- 
 +# enable saslauthd by default
 +copy("/etc/default/saslauthd", "/etc/default/saslauthd.orig") || die "could not read /etc/default/saslauthd.orig";
 +my $saslauthd_orig = IO::File->new("/etc/default/saslauthd.orig", "r") || die "could not read /etc/default/saslauthd.orig";
@@ -36,7 +27,7 @@
  if ( $is_master eq "true" ) {
    ##### Master server setup
    getopt('f');
-@@ -408,6 +420,9 @@
+@@ -465,6 +477,9 @@
      }
    };
  
@@ -46,8 +37,8 @@
    my $confname = "$Kolab::config{'sasl_smtpconffile'}";
    copy("@CONFIG_DIR@/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
  
-@@ -441,12 +456,15 @@
-       Kolab::Conf::bootstrapConfig();
+@@ -506,13 +521,16 @@
+         );
        $Kolab::config{"bootstrap_config"} = 'false';
  
 +      #ldap server should access to certificate key
@@ -57,23 +48,15 @@
        print "temporarily starting slapd\n";
        $ldap_uri = "ldap://127.0.0.1:389/";
        # ensure that the database has correct permissions
-       system("chown $Kolab::config{'ldapserver_rusr'}:$Kolab::config{'ldapserver_grp'} $Kolab::config{'ldapserver_dir'}/*");
+       @files = <$Kolab::config{'ldapserver_dir'}/*>;
+       system("chown $Kolab::config{'ldapserver_rusr'}:$Kolab::config{'ldapserver_grp'} $Kolab::config{'ldapserver_dir'}/*") if (@files);
 -      (system("$Kolab::config{'libexecdir'}/openldap/slapd -h ldap://127.0.0.1:389/ -f $Kolab::config{'ldapserver_confdir'}/slapd.conf -u $Kolab::config{'ldapserver_rusr'} -g $Kolab::config{'ldapserver_grp'}") == 0 ) || die( "Could not start temporary slapd: $!" );
 +      (system("/usr/sbin/slapd -h ldap://127.0.0.1:389/ -f $Kolab::config{'ldapserver_confdir'}/slapd.conf -u $Kolab::config{'ldapserver_rusr'} -g $Kolab::config{'ldapserver_grp'}") == 0 ) || die( "Could not start temporary slapd: $!" );
        print ("Waiting for OpenLDAP to start\n");
        sleep 10;
  
-@@ -781,7 +799,7 @@
+@@ -949,6 +967,9 @@
    chmod 0600, $kolab_config;
-   kolab_chown "$Kolab::config{'kolab_musr'}","$Kolab::config{'kolab_mgrp'}",$kolab_config;
- 
--  if ($kolab_config{'directory_mode'} ne "syncrepl" ) {
-+  if ($Kolab::config{'directory_mode'} ne "syncrepl" ) {
-     print << 'EOS';
- Now the master server needs to be stopped briefly while the contents of the LDAP database
- is copied over to this slave. Please make sure that this slave is entered into the list
-@@ -878,6 +896,9 @@
-   chmod 0600, $kolab_config;
  }
  
 +#run postfix newaliases
@@ -81,4 +64,4 @@
 +
  #system("@CONFIG_DIR@/kolab_sslcert.sh $fqdn");
  print "kolab is now ready to run!\n";
- print "please restart all the daemons\n";
+ print "please run '$Kolab::config{'KOLABRC'} rc all start'\n";