libldap-ruby (0.9.7-1.1) direct (non packaging) changes

--- 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);
--- 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:
--- libldap-ruby-0.9.7.orig/extconf.rb
+++ libldap-ruby-0.9.7/extconf.rb
@@ -256,7 +256,7 @@
 
 doc:
 #\t$(RUBY_INSTALL_NAME) -rrdoc/ri/ri_paths -e 'puts RI::Paths::PATH[0]'
-\trdoc --ri-site *.c lib/ldap
+\trdoc1.8 --ri-site *.c lib/ldap
 
 unit:
 \t(cd test; $(RUBY_INSTALL_NAME) tc_ldif.rb)
--- libldap-ruby-0.9.7.orig/lib/ldap/schema.rb
+++ libldap-ruby-0.9.7/lib/ldap/schema.rb
@@ -35,7 +35,7 @@
       self['objectClasses'].each{|s|
 	if( s =~ /NAME\s+'#{oc}'/ )
 	  case s
-	  when /#{at}\s+\(([\w\d_-\s\$]+)\)/i
+	  when /#{at}\s+\(([\w\d_\s\$-]+)\)/i
 	    return $1.split("$").collect{|attr| attr.strip}
 	  when /#{at}\s+([\w\d_-]+)/i
 	    return $1.split("$").collect{|attr| attr.strip}