[Pkg-openldap-devel] r1343 - in openldap/trunk/debian: . patches

[matthijs at alioth.debian.org]

tags 555409 pending
tags 616703 pending
thanks

Author: matthijs
Date: 2011-03-26 16:45:03 +0000 (Sat, 26 Mar 2011)
New Revision: 1343

Added:
   openldap/trunk/debian/patches/add-tlscacert-option-to-ldap-conf
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
 * Add debian specific patch:
   - Add TLS_CACERT option to ldap.conf


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2011-03-26 16:25:07 UTC (rev 1342)
+++ openldap/trunk/debian/changelog	2011-03-26 16:45:03 UTC (rev 1343)
@@ -4,8 +4,10 @@
   * Refresh all patches
   * Remove manpage-tlscyphersuite-additions, applied upstream
   * Add Slovak translation, thanks Slavko <linux at slavino.sk> (Closes: #608699)
+  * Add debian specific patch for ldap.conf. Add TLS_CACERT option and set it
+    by default to /etc/ssl/certs/ca-certificates.crt (Closes: #555409, #616703)
 
- -- Matthijs Möhlmann <matthijs at cacholong.nl>  Sat, 26 Mar 2011 17:06:42 +0100
+ -- Matthijs Möhlmann <matthijs at cacholong.nl>  Sat, 26 Mar 2011 17:44:27 +0100
 
 openldap (2.4.23-7) unstable; urgency=low
 

Added: openldap/trunk/debian/patches/add-tlscacert-option-to-ldap-conf
===================================================================
--- openldap/trunk/debian/patches/add-tlscacert-option-to-ldap-conf	                        (rev 0)
+++ openldap/trunk/debian/patches/add-tlscacert-option-to-ldap-conf	2011-03-26 16:45:03 UTC (rev 1343)
@@ -0,0 +1,10 @@
+--- a/libraries/libldap/ldap.conf
++++ b/libraries/libldap/ldap.conf
+@@ -11,3 +11,7 @@
+ #SIZELIMIT	12
+ #TIMELIMIT	15
+ #DEREF		never
++
++# TLS certificates (needed for GnuTLS)
++TLS_CACERT	/etc/ssl/certs/ca-certificates.crt
++

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2011-03-26 16:25:07 UTC (rev 1342)
+++ openldap/trunk/debian/patches/series	2011-03-26 16:45:03 UTC (rev 1343)
@@ -14,3 +14,4 @@
 issue-6534-patch
 ldap-conf-tls-cacertdir
 service-operational-before-detach
+add-tlscacert-option-to-ldap-conf