[pkg-kolab] r930 - in kolabd/branches/2.2/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-07-22 21:18:11 +0000 (Tue, 22 Jul 2008)
New Revision: 930

Modified:
   kolabd/branches/2.2/debian/changelog
   kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch
Log:
Updated patch 86-slapd-syncrepl-24: to enable syncrepl as upstream current patch


Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog	2008-07-22 21:15:46 UTC (rev 929)
+++ kolabd/branches/2.2/debian/changelog	2008-07-22 21:18:11 UTC (rev 930)
@@ -29,7 +29,7 @@
     - use syslog
   * new patch 85-slapd-2.4-compat: to be compatible with slapd 2.4 (Closes: 
     #473881)
-  * new patch 86-slapd-syncrepl-24: to enable syncrepl and disable slurpd
+  * new patch 86-slapd-syncrepl-24: to enable syncrepl
     (Closes: #463791)
   * updated patch 90-slapd-template: enable horde.schema by default 
   * updated patch 91-postfix-template: partially applied upstream
@@ -45,7 +45,7 @@
   * debian/preinst: remove unused_conffile
     /etc/kolab/templates/fbview.conf.template 
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 12 Jul 2008 10:03:32 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 22 Jul 2008 23:16:02 +0200
 
 kolabd (2.1.0-20070510.dfsg-3) unstable; urgency=low
 

Modified: kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch	2008-07-22 21:15:46 UTC (rev 929)
+++ kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch	2008-07-22 21:18:11 UTC (rev 930)
@@ -7,22 +7,43 @@
 diff -urNad kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in
 --- kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in	2008-03-15 10:11:23.000000000 +0100
 +++ kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in	2008-03-15 10:11:23.000000000 +0100
-@@ -835,15 +835,6 @@
+@@ -795,14 +795,32 @@
    chmod 0600, $kolab_config;
    kolab_chown "@kolab_musr@","@kolab_mgrp@",$kolab_config;
  
 -  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 
--of kolabhosts on the master before proceeding.
--EOS
++  ######################################################
++  # code needed for slurpd, it can be removed when
++  # kolab has fully switched to syncrepl.
++  my $directory_mode = "";
++  my $kolab_globals = "@sysconfdir@/kolab/kolab.global";
++  my $fd = IO::File->new($kolab_globals, "r")
++    || die "could not open $kolab_globals";
++  foreach (<$fd>) {
++    if (/(.*) : (.*)/) {
++      if ($1 == "directory_mode") { $directory_mode = $2};
++    }
++  }
++
++  if ($directory_mode ne "syncrepl" and $directory_mode ne "sync") {
++    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 
+ of kolabhosts on the master before proceeding.
+ EOS
 -  kolab_system("ssh -CA $master_host /etc/init.d/slapd stop");
 -  kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
 -  kolab_system("ssh -CA $master_host /etc/init.d/slapd start");
--
++    kolab_system("ssh -CA $master_host /etc/init.d/slapd stop");
++    kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
++    kolab_system("ssh -CA $master_host /etc/init.d/slapd start");
++  }
++  # slurpd support
++  ######################################################
++  
+ 
    # FIXME: we should get rid of this construct because it makes the code hard to read.
    #        A if (-e @sysconfdir@/rc.conf) statement should be enough.
-   if ("@WITHOPENPKG@" eq "yes") {
 diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/slapd.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in
 --- kolabd-2.1.99+20080204.dfsg~/templates/slapd.conf.template.in	2008-03-15 10:11:23.000000000 +0100
 +++ kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in	2008-03-15 10:12:16.000000000 +0100