[pkg-kolab] r121 - trunk/kolabd/debian/patches

[Noel Koethe]

Author: noel
Date: 2006-01-09 14:21:11 +0000 (Mon, 09 Jan 2006)
New Revision: 121

Modified:
   trunk/kolabd/debian/patches/30-bootstrap.dpatch
Log:
no real need for rc.conf, removing

Modified: trunk/kolabd/debian/patches/30-bootstrap.dpatch
===================================================================
--- trunk/kolabd/debian/patches/30-bootstrap.dpatch	2006-01-06 16:21:20 UTC (rev 120)
+++ trunk/kolabd/debian/patches/30-bootstrap.dpatch	2006-01-09 14:21:11 UTC (rev 121)
@@ -23,8 +23,8 @@
 exit 0
 
 @DPATCH@
---- kolabd-1.9.4/kolab_bootstrap.orig	2006-01-04 16:46:52.000000000 +0100
-+++ kolabd-1.9.4/kolab_bootstrap	2006-01-04 18:23:40.000000000 +0100
+--- kolabd-1.9.4/kolab_bootstrap.orig   2006-01-04 16:46:52.000000000 +0100
++++ kolabd-1.9.4/kolab_bootstrap        2006-01-09 14:29:01.000000000 +0100
 @@ -76,7 +76,7 @@
      print ("Error: Found $name running on Port $port\n");
      print ("Check your installation!\n");
@@ -158,23 +158,34 @@
        print ("Waiting for OpenLDAP to start\n");
        sleep 10;
  
-@@ -537,27 +540,27 @@
+@@ -536,28 +539,28 @@
+ 
     print "Create initial config files for postfix, apache, proftpd, cyrus imap, saslauthd\n";
  
-    my $cfg;
+-   my $cfg;
 -   open(FH, "<$kolab_prefix/etc/rc.conf") || die;
-+   open(FH, "</etc/kolab/rc.conf") || die;
-    $cfg .= $_ while (<FH>);
-    close(FH);
- 
-    $cfg =~ s/\n((openldap_url|sasl_authmech)\S*=[^\n]*)/#$1\n/sg;
-    $cfg .= "openldap_url=\"ldap:// ldaps://\"\nsasl_authmech=\"ldap\"\n";
- 
+-   $cfg .= $_ while (<FH>);
+-   close(FH);
+-
+-   $cfg =~ s/\n((openldap_url|sasl_authmech)\S*=[^\n]*)/#$1\n/sg;
+-   $cfg .= "openldap_url=\"ldap:// ldaps://\"\nsasl_authmech=\"ldap\"\n";
+-
 -   open(FH, ">$kolab_prefix/etc/rc.conf") || die;
-+   open(FH, ">/etc/kolab/rc.conf") || die;
-    print FH $cfg;
-    close(FH);
-    undef $cfg;
+-   print FH $cfg;
+-   close(FH);
+-   undef $cfg;
++   #my $cfg;
++   #open(FH, "</etc/kolab/rc.conf") || die;
++   #$cfg .= $_ while (<FH>);
++   #close(FH);
++
++   #$cfg =~ s/\n((openldap_url|sasl_authmech)\S*=[^\n]*)/#$1\n/sg;
++   #$cfg .= "openldap_url=\"ldap:// ldaps://\"\nsasl_authmech=\"ldap\"\n";
++
++   #open(FH, ">/etc/kolab/rc.conf") || die;
++   #print FH $cfg;
++   #close(FH);
++   #undef $cfg;
  
     #print " running $kolab_prefix/etc/kolab/kolab -v -o -l$ldap_uri\n";
 -   print "running $kolab_prefix/sbin/kolabconf -n\n";