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

[Mathieu Parent]

Author: sathieu
Date: 2009-10-07 21:27:10 +0000 (Wed, 07 Oct 2009)
New Revision: 1359

Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/patches/10-invoke-rc.diff
   libkolab-perl/trunk/debian/patches/30-bootstrap.diff
   libkolab-perl/trunk/debian/patches/40-disable-amavis.diff
Log:
  * 30-bootstrap.diff: Fix from upstream
    sbin/kolab_bootstrap.in.diff r1.10
  * Refreshed patches


Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog	2009-10-04 17:41:31 UTC (rev 1358)
+++ libkolab-perl/trunk/debian/changelog	2009-10-07 21:27:10 UTC (rev 1359)
@@ -4,8 +4,10 @@
   * updated Standards-Version to 3.8.3: no changes
   * Add README.source as required by policy 4.14
   * Change my email address, as I am now Debian developer
+  * 30-bootstrap.diff: Fix from upstream
+    sbin/kolab_bootstrap.in.diff r1.10
 
- -- Mathieu Parent <sathieu at debian.org>  Wed, 23 Sep 2009 21:35:29 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Wed, 07 Oct 2009 23:24:38 +0200
 
 libkolab-perl (1:2.2.1-20090331-1) unstable; urgency=low
 

Modified: libkolab-perl/trunk/debian/patches/10-invoke-rc.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/10-invoke-rc.diff	2009-10-04 17:41:31 UTC (rev 1358)
+++ libkolab-perl/trunk/debian/patches/10-invoke-rc.diff	2009-10-07 21:27:10 UTC (rev 1359)
@@ -4,10 +4,11 @@
 ## DP: Debian specific invocation of services
 
 @DPATCH@
-diff -urNad kolabconf-2.2.0~/lib/Kolab/Conf.pm kolabconf-2.2.0/lib/Kolab/Conf.pm
---- kolabconf-2.2.0~/lib/Kolab/Conf.pm	2008-10-14 19:50:45.000000000 +0200
-+++ kolabconf-2.2.0/lib/Kolab/Conf.pm	2008-10-14 19:51:43.000000000 +0200
-@@ -724,38 +724,28 @@
+Index: b/lib/Kolab/Conf.pm
+===================================================================
+--- a/lib/Kolab/Conf.pm
++++ b/lib/Kolab/Conf.pm
+@@ -843,38 +843,28 @@
  {
      if ($haschanged{'slapd'}) {
          &Kolab::log('K', 'Restarting OpenLDAP...');

Modified: libkolab-perl/trunk/debian/patches/30-bootstrap.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/30-bootstrap.diff	2009-10-04 17:41:31 UTC (rev 1358)
+++ libkolab-perl/trunk/debian/patches/30-bootstrap.diff	2009-10-07 21:27:10 UTC (rev 1359)
@@ -2,13 +2,13 @@
 
 Author: Noèl Köthe <noel at debian.org>
 
-Upstream status: Parts can be included
+Upstream status: Parts can be or have been included
 
 Index: b/sbin/kolab_bootstrap.in
 ===================================================================
 --- a/sbin/kolab_bootstrap.in
 +++ b/sbin/kolab_bootstrap.in
-@@ -74,7 +74,7 @@
+@@ -109,7 +109,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");
@@ -17,7 +17,7 @@
      exit 1;
    }
  }
-@@ -186,7 +186,7 @@
+@@ -221,7 +221,7 @@
  
  print ("Excellent all required Ports are available!\n");
  
@@ -26,7 +26,7 @@
  if ($?==0) {
    print ("\nFound existing configuration\n");
    print "\nBootstrapping Kolab will overwrite old configuration\n";
-@@ -285,6 +285,18 @@
+@@ -320,6 +320,18 @@
    print "Proceeding with master server setup\n\n";
  }
  
@@ -45,7 +45,7 @@
  if ( $is_master eq "true" ) {
    ##### Master server setup
    getopt('f');
-@@ -373,6 +385,9 @@
+@@ -408,6 +420,9 @@
      }
    };
  
@@ -55,7 +55,7 @@
    my $confname = "$Kolab::config{'sasl_smtpconffile'}";
    copy("@CONFIG_DIR@/templates/smtpd.conf.template", $confname) || die "could not write to $confname";
  
-@@ -406,12 +421,15 @@
+@@ -441,12 +456,15 @@
        Kolab::Conf::bootstrapConfig();
        $Kolab::config{"bootstrap_config"} = 'false';
  
@@ -72,8 +72,17 @@
        print ("Waiting for OpenLDAP to start\n");
        sleep 10;
  
-@@ -836,8 +854,11 @@
+@@ -781,7 +799,7 @@
    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,8 +896,11 @@
+   chmod 0600, $kolab_config;
  }
  
 +#run postfix newaliases

Modified: libkolab-perl/trunk/debian/patches/40-disable-amavis.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/40-disable-amavis.diff	2009-10-04 17:41:31 UTC (rev 1358)
+++ libkolab-perl/trunk/debian/patches/40-disable-amavis.diff	2009-10-07 21:27:10 UTC (rev 1359)
@@ -8,7 +8,7 @@
 ===================================================================
 --- a/sbin/kolab_bootstrap.in
 +++ b/sbin/kolab_bootstrap.in
-@@ -517,7 +517,7 @@
+@@ -498,7 +498,7 @@
          'postfix-mynetworks' => $mynetworkinterfaces,
          #'postfix-relayhost' => "",
          #'postfix-transport' => "",