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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-02-24 07:10:29 +0000 (Tue, 24 Feb 2009)
New Revision: 1211

Removed:
   openldap/trunk/debian/patches/no-crlcheck-for-gnutls
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
drop patch no-crlcheck-for-gnutls, merged upstream in 2.4.15

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2009-02-24 07:08:38 UTC (rev 1210)
+++ openldap/trunk/debian/changelog	2009-02-24 07:10:29 UTC (rev 1211)
@@ -10,8 +10,6 @@
   * 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
 

Deleted: openldap/trunk/debian/patches/no-crlcheck-for-gnutls
===================================================================
--- openldap/trunk/debian/patches/no-crlcheck-for-gnutls	2009-02-24 07:08:38 UTC (rev 1210)
+++ openldap/trunk/debian/patches/no-crlcheck-for-gnutls	2009-02-24 07:10:29 UTC (rev 1211)
@@ -1,55 +0,0 @@
-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
-@@ -562,6 +562,7 @@
- 		}
- 		return ldap_pvt_tls_set_option( ld, option, &i );
- 		}
-+#ifdef HAVE_OPENSSL_CRL
- 	case LDAP_OPT_X_TLS_CRLCHECK:	/* OpenSSL only */
- 		i = -1;
- 		if ( strcasecmp( arg, "none" ) == 0 ) {
-@@ -575,6 +576,7 @@
- 			return ldap_pvt_tls_set_option( ld, option, &i );
- 		}
- 		return -1;
-+#endif
- 	}
- 	return -1;
- }
-@@ -638,9 +640,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;
-@@ -764,6 +768,7 @@
- 			return 0;
- 		}
- 		return -1;
-+#ifdef HAVE_OPENSSL_CRL
- 	case LDAP_OPT_X_TLS_CRLCHECK:	/* OpenSSL only */
- 		if ( !arg ) return -1;
- 		switch( *(int *) arg ) {
-@@ -774,6 +779,7 @@
- 			return 0;
- 		}
- 		return -1;
-+#endif
- 	case LDAP_OPT_X_TLS_CIPHER_SUITE:
- 		if ( lo->ldo_tls_ciphersuite ) LDAP_FREE( lo->ldo_tls_ciphersuite );
- 		lo->ldo_tls_ciphersuite = arg ? LDAP_STRDUP( (char *) arg ) : NULL;

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2009-02-24 07:08:38 UTC (rev 1210)
+++ openldap/trunk/debian/patches/series	2009-02-24 07:10:29 UTC (rev 1211)
@@ -9,4 +9,3 @@
 libldap-symbol-versions
 getaddrinfo-is-threadsafe
 back-perl-init
-no-crlcheck-for-gnutls