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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-02-17 20:26:38 +0000 (Tue, 17 Feb 2009)
New Revision: 1206

Added:
   openldap/trunk/debian/patches/no-crlcheck-for-gnutls
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
New patch, no-crlcheck-for-gnutls, to fix a build failure when using
--with-tls=gnutls.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2009-02-17 19:15:06 UTC (rev 1205)
+++ openldap/trunk/debian/changelog	2009-02-17 20:26:38 UTC (rev 1206)
@@ -10,6 +10,8 @@
   * Build against db4.7 instead of db4.2 at last!  Closes: #421946.
   * Build with --disable-ndb, to avoid a misbuild when libmysqlclient is
     installed in the build environment.
+  * New patch, no-crlcheck-for-gnutls, to fix a build failure when using
+    --with-tls=gnutls.
 
  -- Steve Langasek <vorlon at debian.org>  Tue, 17 Feb 2009 09:41:22 -0800
 

Added: openldap/trunk/debian/patches/no-crlcheck-for-gnutls
===================================================================
--- openldap/trunk/debian/patches/no-crlcheck-for-gnutls	                        (rev 0)
+++ openldap/trunk/debian/patches/no-crlcheck-for-gnutls	2009-02-17 20:26:38 UTC (rev 1206)
@@ -0,0 +1,23 @@
+Author: Steve Langasek <steve.langasek at canonical.com>
+
+OpenLDAP 2.4.14 doesn't build with GnuTLS due to a missed guard around a
+use of an OpenSSL-specific option.
+
+ITS #5955
+
+Index: trunk/libraries/libldap/tls2.c
+===================================================================
+--- trunk.orig/libraries/libldap/tls2.c
++++ trunk/libraries/libldap/tls2.c
+@@ -638,9 +638,11 @@
+ 	case LDAP_OPT_X_TLS_REQUIRE_CERT:
+ 		*(int *)arg = lo->ldo_tls_require_cert;
+ 		break;
++#ifdef HAVE_OPENSSL_CRL
+ 	case LDAP_OPT_X_TLS_CRLCHECK:	/* OpenSSL only */
+ 		*(int *)arg = lo->ldo_tls_crlcheck;
+ 		break;
++#endif
+ 	case LDAP_OPT_X_TLS_CIPHER_SUITE:
+ 		*(char **)arg = lo->ldo_tls_ciphersuite ?
+ 			LDAP_STRDUP( lo->ldo_tls_ciphersuite ) : NULL;

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2009-02-17 19:15:06 UTC (rev 1205)
+++ openldap/trunk/debian/patches/series	2009-02-17 20:26:38 UTC (rev 1206)
@@ -9,3 +9,4 @@
 libldap-symbol-versions
 getaddrinfo-is-threadsafe
 back-perl-init
+no-crlcheck-for-gnutls