[DRE-commits] [SCM] ruby-ldap.git branch, master, updated. debian/0.9.12-1-1-ge8026a3

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit e8026a36a7a83dec93ed8f9d59a945cad175890f
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Jun 22 18:21:06 2012 +0200

    Merge NMU changes for 0.9.12-1.1 by Gregor Herrman

diff --git a/debian/changelog b/debian/changelog
index d50145d..7d8ab9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ruby-ldap (0.9.12-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: sslconn.c:103:7: error: format not a string literal and
+    no format arguments [-Werror=format-security]":
+    add patch rb_raise_format_string.patch from Johannes Brandstätter (adds
+    format strings).
+    (Closes: #676205)
+
+ -- gregor herrmann <gregoa at debian.org>  Fri, 22 Jun 2012 16:36:36 +0200
+
 ruby-ldap (0.9.12-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/rb_raise_format_string.patch b/debian/patches/rb_raise_format_string.patch
new file mode 100644
index 0000000..bc7ba03
--- /dev/null
+++ b/debian/patches/rb_raise_format_string.patch
@@ -0,0 +1,29 @@
+--- a/conn.c
++++ b/conn.c
+@@ -674,7 +674,7 @@
+     }
+   else
+     {
+-      rb_raise (rb_eLDAP_Error, ldap_err2string (ldapdata->err));
++      rb_raise (rb_eLDAP_Error, "%s", ldap_err2string (ldapdata->err));
+     };
+ #else
+   rb_notimplement ();
+--- a/rbldap.h
++++ b/rbldap.h
+@@ -141,13 +141,13 @@
+ 
+ #define Check_LDAP_Result(err) { \
+   if( (err) != LDAP_SUCCESS && (err) != LDAP_SIZELIMIT_EXCEEDED ){ \
+-    rb_raise(rb_eLDAP_ResultError, ldap_err2string(err)); \
++    rb_raise(rb_eLDAP_ResultError, "%s", ldap_err2string(err)); \
+   } \
+ }
+ 
+ #define Check_LDAP_OPT_Result(err) { \
+   if( (err) != LDAP_OPT_SUCCESS ){ \
+-    rb_raise(rb_eLDAP_ResultError, ldap_err2string(err)); \
++    rb_raise(rb_eLDAP_ResultError, "%s", ldap_err2string(err)); \
+   } \
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f12dbfe
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+rb_raise_format_string.patch

-- 
ruby-ldap.git