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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-10-11 08:48:12 +0000 (Sat, 11 Oct 2008)
New Revision: 1192

Removed:
   openldap/trunk/debian/patches/gnutls-ssf
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
drop patch gnutls-ssf, also applied upstream

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-10-11 08:46:36 UTC (rev 1191)
+++ openldap/trunk/debian/changelog	2008-10-11 08:48:12 UTC (rev 1192)
@@ -3,8 +3,9 @@
   * New upstream version (closes: #499560).
     - Fixes a crash with syncrepl and delcsn (closes: #491066).
     - Fix CRL handling with GnuTLS (closes: #498410).
-    - Drop patches no_backend_inter-linking and
-      CVE-2008-2952_BER-decoding-assertion, applied upstream.
+    - Drop patches no_backend_inter-linking,
+      CVE-2008-2952_BER-decoding-assertion, and gnutls-ssf, applied
+      upstream.
 
   [ Russ Allbery ]
   * New patch, back-perl-init, which updates the calling conventions

Deleted: openldap/trunk/debian/patches/gnutls-ssf
===================================================================
--- openldap/trunk/debian/patches/gnutls-ssf	2008-10-11 08:46:36 UTC (rev 1191)
+++ openldap/trunk/debian/patches/gnutls-ssf	2008-10-11 08:48:12 UTC (rev 1192)
@@ -1,16 +0,0 @@
-GnuTLS returns the cipher strength in bytes and OpenLDAP expects bits.
-
-Debian Bug#473796
-Upstream ITS #5585
-
---- openldap.orig/libraries/libldap/tls.c
-+++ openldap/libraries/libldap/tls.c
-@@ -2796,7 +2796,7 @@
- 	gnutls_cipher_algorithm_t c;
- 
- 	c = gnutls_cipher_get( session->session );
--	return gnutls_cipher_get_key_size( c );
-+	return gnutls_cipher_get_key_size( c ) * 8;
- #else
- 	return 0;
- #endif

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2008-10-11 08:46:36 UTC (rev 1191)
+++ openldap/trunk/debian/patches/series	2008-10-11 08:48:12 UTC (rev 1192)
@@ -9,5 +9,4 @@
 libldap-symbol-versions
 gnutls-ciphers
 getaddrinfo-is-threadsafe
-gnutls-ssf 
 back-perl-init