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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-02-17 18:42:54 +0000 (Tue, 17 Feb 2009)
New Revision: 1202

Removed:
   openldap/trunk/debian/patches/gnutls-ciphers
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
(tentatively) drop gnutls-ciphers, since this bug was reported to be
fixed upstream in 2.4.8.  The fix applied in 2.4.8 didn't match the
patch from the bug report, so this should be watched for regressions.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2009-02-17 18:39:13 UTC (rev 1201)
+++ openldap/trunk/debian/changelog	2009-02-17 18:42:54 UTC (rev 1202)
@@ -4,6 +4,9 @@
     - Fixes a bug with the pcache overlay not returning cached entries
       (closes: #497697)
     - Update evolution-ntlm patch to apply to current Makefiles.
+    - (tentatively) drop gnutls-ciphers, since this bug was reported to be
+      fixed upstream in 2.4.8.  The fix applied in 2.4.8 didn't match the
+      patch from the bug report, so this should be watched for regressions.
   * Build against db4.7 instead of db4.2 at last!  Closes: #421946.
 
  -- Steve Langasek <vorlon at debian.org>  Tue, 17 Feb 2009 09:41:22 -0800

Deleted: openldap/trunk/debian/patches/gnutls-ciphers
===================================================================
--- openldap/trunk/debian/patches/gnutls-ciphers	2009-02-17 18:39:13 UTC (rev 1201)
+++ openldap/trunk/debian/patches/gnutls-ciphers	2009-02-17 18:42:54 UTC (rev 1202)
@@ -1,25 +0,0 @@
-Patch from Kyle Moffett <kyle at moffetthome.net>
-
-Update GnuTLS support to allow specifying multiple ciphers as a
-colon-separated list in TLSCipherSuite.
-
-Addresses ITS#5341.
-
---- openldap.orig/libraries/libldap/tls.c
-+++ openldap/libraries/libldap/tls.c
-@@ -300,6 +300,7 @@
- 		for (i=0; i<n_ciphers; i++) {
- 			if ( !strncasecmp( ciphers[i].name, ptr, len )) {
- 				num++;
-+				ptr = end + 1;
- 				break;
- 			}
- 		}
-@@ -331,6 +332,7 @@
- 			 * only appear once in each list.
- 			 */
- 			if ( !strncasecmp( ciphers[i].name, ptr, len )) {
-+				ptr = end + 1;
- 				for (j=0; j<nkx; j++)
- 					if ( kx[j] == ciphers[i].kx )
- 						break;

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2009-02-17 18:39:13 UTC (rev 1201)
+++ openldap/trunk/debian/patches/series	2009-02-17 18:42:54 UTC (rev 1202)
@@ -7,6 +7,5 @@
 index-files-created-as-root 
 sasl-default-path 
 libldap-symbol-versions
-gnutls-ciphers
 getaddrinfo-is-threadsafe
 back-perl-init