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

[Mathieu Parent]

Author: sathieu
Date: 2009-10-07 21:48:57 +0000 (Wed, 07 Oct 2009)
New Revision: 1360

Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/patches/10-invoke-rc.diff
   libkolab-perl/trunk/debian/patches/30-bootstrap.diff
Log:
  * 10-invoke-rc.diff: Fix from upstream
    sbin/kolab_bootstrap.in.diff r1.10
  * now 30-bootstrap.diff contains all non- invoke-rc stuff



Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog	2009-10-07 21:27:10 UTC (rev 1359)
+++ libkolab-perl/trunk/debian/changelog	2009-10-07 21:48:57 UTC (rev 1360)
@@ -1,13 +1,14 @@
-libkolab-perl (1:2.2.1-20090331-2~pre3) kolab-snapshots; urgency=low
+libkolab-perl (1:2.2.1-20090331-2~pre4) kolab-snapshots; urgency=low
 
   * NOT RELEASED YET
   * 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
+  * 10-invoke-rc.diff: Fix from upstream
     sbin/kolab_bootstrap.in.diff r1.10
+  * now 30-bootstrap.diff contains all non- invoke-rc stuff 
 
- -- Mathieu Parent <sathieu at debian.org>  Wed, 07 Oct 2009 23:24:38 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Wed, 07 Oct 2009 23:48:37 +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-07 21:27:10 UTC (rev 1359)
+++ libkolab-perl/trunk/debian/patches/10-invoke-rc.diff	2009-10-07 21:48:57 UTC (rev 1360)
@@ -52,3 +52,54 @@
      }
  
      %Kolab::Conf::haschanged = ();
+Index: b/sbin/kolab_bootstrap.in
+===================================================================
+--- a/sbin/kolab_bootstrap.in
++++ b/sbin/kolab_bootstrap.in
+@@ -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");
+-    print ("You may try to execute \"$Kolab::config{'KOLABRC'} rc all stop\" initially\n");
++    print ("You may try to execute \"/etc/init.d/\$DAEMON stop\" initially\n");
+     exit 1;
+   }
+ }
+@@ -612,7 +612,7 @@
+ 
+    if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
+       print "\nkill temporary slapd\n\n";
+-      system("$Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} stop");
++      system("invoke-rc.d slapd stop");
+       sleep 1; # actually race should be impossible
+       system("killall -9 slapd >/dev/null 2>&1");
+    }
+@@ -665,7 +665,7 @@
+   ##### Slave server setup
+ 
+   print "stop running slapd (if any)\n";
+-  kolab_system("$Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} stop");
++  kolab_system("invoke-rc.d slapd stop");
+ 
+   # Make sure that no rogue demons are running
+   tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
+@@ -787,9 +787,9 @@
+ 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 -C $master_host \'$Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} stop".
++    kolab_system("ssh -C $master_host \'invoke-rc.d slapd stop".
+                  " && $Kolab::config{'TAR'} -C $Kolab::config{'ldapserver_statedir'} -pcf - openldap-data".
+-                 " && $Kolab::config{'KOLABRC'} rc $Kolab::config{'LDAPD'} start\'".
++                 " && invoke-rc.d slapd start\'".
+                  " | $Kolab::config{'TAR'} -C $Kolab::config{'ldapserver_statedir'} -pxf -");
+   }
+ 
+@@ -880,6 +880,6 @@
+ 
+ #system("@CONFIG_DIR@/kolab_sslcert.sh $fqdn");
+ print "kolab is now ready to run!\n";
+-print "please run '$Kolab::config{'KOLABRC'} rc all start'\n";
++print "please restart all the daemons\n";
+ print ("Use login=manager and passwd=$bind_pw when you log into\n");
+ print ("the webinterface https://$fqdn$Kolab::config{'kolab_wui'} !\n");

Modified: libkolab-perl/trunk/debian/patches/30-bootstrap.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/30-bootstrap.diff	2009-10-07 21:27:10 UTC (rev 1359)
+++ libkolab-perl/trunk/debian/patches/30-bootstrap.diff	2009-10-07 21:48:57 UTC (rev 1360)
@@ -8,15 +8,6 @@
 ===================================================================
 --- a/sbin/kolab_bootstrap.in
 +++ b/sbin/kolab_bootstrap.in
-@@ -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");
--    print ("You may try to execute \"$Kolab::config{'KOLABRC'} rc all stop\" initially\n");
-+    print ("You may try to execute \"/etc/init.d/\$DAEMON stop\" initially\n");
-     exit 1;
-   }
- }
 @@ -221,7 +221,7 @@
  
  print ("Excellent all required Ports are available!\n");
@@ -81,7 +72,7 @@
      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 @@
+@@ -878,6 +896,9 @@
    chmod 0600, $kolab_config;
  }
  
@@ -90,7 +81,4 @@
 +
  #system("@CONFIG_DIR@/kolab_sslcert.sh $fqdn");
  print "kolab is now ready to run!\n";
--print "please run '$Kolab::config{'KOLABRC'} rc all start'\n";
-+print "please restart all the daemons'\n";
- print ("Use login=manager and passwd=$bind_pw when you log into\n");
- print ("the webinterface https://$fqdn$Kolab::config{'kolab_wui'} !\n");
+ print "please restart all the daemons\n";