[pkg-kolab] r762 - kolabd/branches/2.2/debian/patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-03-15 09:24:04 +0000 (Sat, 15 Mar 2008)
New Revision: 762

Modified:
   kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch
Log:
updated 86-slapd-syncrepl-24 patch to remove obsolete and ignored slapd directives


Modified: kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch	2008-03-14 20:06:05 UTC (rev 761)
+++ kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch	2008-03-15 09:24:04 UTC (rev 762)
@@ -5,8 +5,8 @@
 
 @DPATCH@
 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-02-17 19:22:42.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in	2008-02-17 19:23:15.000000000 +0100
+--- 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 @@
    chmod 0600, $kolab_config;
    kolab_chown "@kolab_musr@","@kolab_mgrp@",$kolab_config;
@@ -24,9 +24,20 @@
    #        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-02-17 19:22:42.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in	2008-02-17 19:23:49.000000000 +0100
-@@ -63,6 +63,23 @@
+--- 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
+@@ -24,10 +24,7 @@
+ #include @ldapserver_schemadir@/horde.schema
+ 
+ pidfile		@ldapserver_pidfile@
+-replica-pidfile	@ldapserverslurpd_pidfile@
+ argsfile	@ldapserver_argsfile@
+-replogfile      @ldapserver_replogfile@
+-replicationinterval 5
+ 
+ #schemacheck doesn't exists in debian's slapd 2.4
+ #schemacheck 	       on
+@@ -66,6 +63,23 @@
          bindmethod=simple 
  	credentials=secret