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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-05-25 14:40:02 +0000 (Sun, 25 May 2008)
New Revision: 874

Modified:
   kolabd/branches/2.2/debian/changelog
   kolabd/branches/2.2/debian/patches/85-slapd-2.4-compat.dpatch
Log:
Reverted the slapd 2.4 patch. Upstream patch is not sufficient.


Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog	2008-05-25 14:17:20 UTC (rev 873)
+++ kolabd/branches/2.2/debian/changelog	2008-05-25 14:40:02 UTC (rev 874)
@@ -32,7 +32,7 @@
     http://lists.debian.org/debian-legal/2008/04/msg00087.html
   * debian/postinst: add user cyrus to group kolab. This is needed for PKI.
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 25 May 2008 16:16:19 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 25 May 2008 16:39:14 +0200
 
 kolabd (2.1.0-20070510.dfsg-3) unstable; urgency=low
 

Modified: kolabd/branches/2.2/debian/patches/85-slapd-2.4-compat.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/85-slapd-2.4-compat.dpatch	2008-05-25 14:17:20 UTC (rev 873)
+++ kolabd/branches/2.2/debian/patches/85-slapd-2.4-compat.dpatch	2008-05-25 14:40:02 UTC (rev 874)
@@ -4,9 +4,9 @@
 ## DP: Purpose : be compatible with OpenLDAP 2.4
 
 @DPATCH@
-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:09:13.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in	2008-03-15 10:10:17.000000000 +0100
+diff -urNad kolabd-2.1.99-20080521.dfsg~/templates/slapd.conf.template.in kolabd-2.1.99-20080521.dfsg/templates/slapd.conf.template.in
+--- kolabd-2.1.99-20080521.dfsg~/templates/slapd.conf.template.in	2008-05-25 16:36:39.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg/templates/slapd.conf.template.in	2008-05-25 16:37:12.000000000 +0200
 @@ -29,7 +29,8 @@
  replogfile      @ldapserver_replogfile@
  replicationinterval 5
@@ -17,4 +17,16 @@
  
  TLSCertificateFile     @sysconfdir@/kolab/cert.pem
  TLSCertificateKeyFile  @sysconfdir@/kolab/key.pem
-
+@@ -49,9 +50,9 @@
+ checkpoint 	512 5
+ idlcachesize    10000
+ idletimeout	300
+-		# The idletimeout can be increased if some clients develop
+-		# problems. Please report to kolab-devel at kolab.org
+-		# if you encounter such a client.
++#		The idletimeout can be increased if some clients develop
++#		problems. Please report to kolab-devel at kolab.org
++#		if you encounter such a client.
+ dirtyread
+ 
+ directory	@ldapserver_dir@