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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-02-29 06:14:48 +0000 (Fri, 29 Feb 2008)
New Revision: 1111

Removed:
   openldap/trunk/debian/patches/gnutls-altname-nulterminated
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
* Drop patch gnutls-altname-nulterminated; it's been determined that the
  "length" discrepancy was a bug in gnutls, and fixed in that package.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-02-27 19:24:07 UTC (rev 1110)
+++ openldap/trunk/debian/changelog	2008-02-29 06:14:48 UTC (rev 1111)
@@ -21,6 +21,8 @@
     Closes LP: #191563.
   * drop LGPL from debian/copyright; there is no longer any code under this
     license in the package.
+  * Drop patch gnutls-altname-nulterminated; it's been determined that the
+    "length" discrepancy was a bug in gnutls, and fixed in that package.
 
   [ Russ Allbery ]
   * Add a stamp file for the configure rule to avoid rerunning configure

Deleted: openldap/trunk/debian/patches/gnutls-altname-nulterminated
===================================================================
--- openldap/trunk/debian/patches/gnutls-altname-nulterminated	2008-02-27 19:24:07 UTC (rev 1110)
+++ openldap/trunk/debian/patches/gnutls-altname-nulterminated	2008-02-29 06:14:48 UTC (rev 1111)
@@ -1,23 +0,0 @@
-Author: Steve Langasek <vorlon at debian.org>
-
-When using GnuTLS, the size returned for subjectAltNames includes a
-terminating NUL whereas the size of a CN does not; account for this
-difference when comparing certificates.
-
-Partially addresses Debian bug #462588.
-
-Forwarded upstream as ITS #5361.
-
-Index: libraries/libldap/tls.c
-===================================================================
---- libraries/libldap/tls.c	(revision 1074)
-+++ libraries/libldap/tls.c	(working copy)
-@@ -1846,7 +1846,7 @@
- 			if (ntype != IS_DNS) continue;
- 	
- 			/* Is this an exact match? */
--			if ((len1 == altnamesize) && !strncasecmp(name, altname, len1)) {
-+			if ((len1 == altnamesize - 1) && !strncasecmp(name, altname, len1)) {
- 				break;
- 			}
- 

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2008-02-27 19:24:07 UTC (rev 1110)
+++ openldap/trunk/debian/patches/series	2008-02-29 06:14:48 UTC (rev 1111)
@@ -11,6 +11,5 @@
 gnutls-ciphers
 entryCSN-backwards-compatibility
 slapd-tlsverifyclient-default -p0
-gnutls-altname-nulterminated -p0
 getaddrinfo-is-threadsafe
 sasl-cleartext-strncasecmp -p0