tags 521980 +patch +pending
thanks

Hi,

I will shortly NMU this bug with the attached interdiff.


cheers,

Michael
diff -u libldap-ruby-0.9.7/debian/changelog libldap-ruby-0.9.7/debian/changelog
--- libldap-ruby-0.9.7/debian/changelog
+++ libldap-ruby-0.9.7/debian/changelog
@@ -1,3 +1,11 @@
+libldap-ruby (0.9.7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * conn.c: Replaced LDAP_OPT_X_TLS_PROTOCOL with LDAP_OPT_X_TLS_PROTOCOL_MIN.
+  * ldap.c: Likewise (Closes: #521980)
+
+ -- Michael Banck <mba...@debian.org>  Sun, 29 Nov 2009 00:19:46 +0100
+
 libldap-ruby (0.9.7-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- libldap-ruby-0.9.7.orig/ldap.c
+++ libldap-ruby-0.9.7/ldap.c
@@ -420,8 +420,8 @@
 #ifdef LDAP_OPT_X_TLS
   rb_ldap_define_opt (LDAP_OPT_X_TLS);
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL);
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_MIN);
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
   rb_ldap_define_opt (LDAP_OPT_X_TLS_CIPHER_SUITE);
only in patch2:
unchanged:
--- libldap-ruby-0.9.7.orig/conn.c
+++ libldap-ruby-0.9.7/conn.c
@@ -497,8 +497,8 @@
 #ifdef LDAP_OPT_X_TLS_KEYFILE
     case LDAP_OPT_X_TLS_KEYFILE:
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-    case LDAP_OPT_X_TLS_PROTOCOL:
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+    case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
     case LDAP_OPT_X_TLS_CIPHER_SUITE:
@@ -627,8 +627,8 @@
 #ifdef LDAP_OPT_X_TLS_KEYFILE
        case LDAP_OPT_X_TLS_KEYFILE:
 #endif
-#ifdef LDAP_OPT_X_TLS_PROTOCOL
-       case LDAP_OPT_X_TLS_PROTOCOL:
+#ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
+       case LDAP_OPT_X_TLS_PROTOCOL_MIN:
 #endif
 #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
        case LDAP_OPT_X_TLS_CIPHER_SUITE:

Reply via email to