[qpid-qmf] Fix dependencies onto qpid-cpp packages to be >= 0.24.

[Darryl L. Pierce]

commit e131049d57022de282514bc588669f5132e3ba4d
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Mon Feb 3 12:59:29 2014 -0500

    Fix dependencies onto qpid-cpp packages to be >= 0.24.
    
    - Fixed building with -Werror=format-security enabled.

 ...ix-Ruby-Perl-bindings-when-built-with-Wer.patch |   83 ++++++++++++++++++++
 qpid-qmf.spec                                      |    3 +
 2 files changed, 86 insertions(+), 0 deletions(-)
---
diff --git a/02-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch b/02-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch
new file mode 100644
index 0000000..862a693
--- /dev/null
+++ b/02-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch
@@ -0,0 +1,83 @@
+From ba180ca4a513615339b270f53b5ed78dc4169efe Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <dpierce at redhat.com>
+Date: Tue, 21 Jan 2014 14:16:38 -0500
+Subject: [PATCH] QPID-5499: Fix Ruby/Perl bindings when built with
+ -Werror=format-security
+
+Changed the swig descriptors so that they use a constant format string.
+---
+ qpid/cpp/bindings/qmf2/ruby/ruby.i         | 2 +-
+ qpid/cpp/bindings/qpid/perl/perl.i         | 2 +-
+ qpid/cpp/bindings/qpid/ruby/ruby.i         | 2 +-
+ qpid/cpp/include/qpid/swig_perl_typemaps.i | 2 +-
+ qpid/cpp/include/qpid/swig_ruby_typemaps.i | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/qpid/cpp/bindings/qmf2/ruby/ruby.i b/qpid/cpp/bindings/qmf2/ruby/ruby.i
+index 0254017..65d0770 100644
+--- a/qpid/cpp/bindings/qmf2/ruby/ruby.i
++++ b/qpid/cpp/bindings/qmf2/ruby/ruby.i
+@@ -30,7 +30,7 @@
+     }
+     catch (qpid::types::Exception& mex) {
+         static VALUE qmferror = rb_define_class("QmfError", rb_eStandardError);
+-        rb_raise(qmferror, mex.what());
++        rb_raise(qmferror, "%s", mex.what());
+     }
+ }
+ 
+diff --git a/qpid/cpp/bindings/qpid/perl/perl.i b/qpid/cpp/bindings/qpid/perl/perl.i
+index 0d118ae..4dc2665 100644
+--- a/qpid/cpp/bindings/qpid/perl/perl.i
++++ b/qpid/cpp/bindings/qpid/perl/perl.i
+@@ -27,7 +27,7 @@
+         $action
+     }
+     catch (qpid::messaging::MessagingException& mex) {
+-        Perl_croak(aTHX_ mex.what());
++      Perl_croak(aTHX_ "%s", mex.what());
+     }
+ }
+ 
+diff --git a/qpid/cpp/bindings/qpid/ruby/ruby.i b/qpid/cpp/bindings/qpid/ruby/ruby.i
+index 3d686c2..99d29b0 100644
+--- a/qpid/cpp/bindings/qpid/ruby/ruby.i
++++ b/qpid/cpp/bindings/qpid/ruby/ruby.i
+@@ -30,7 +30,7 @@
+     }
+     catch (qpid::messaging::MessagingException& mex) {
+         static VALUE merror = rb_define_class("MessagingError", rb_eStandardError);
+-        rb_raise(merror, mex.what());
++        rb_raise(merror, "%s", mex.what());
+     }
+ }
+ 
+diff --git a/qpid/cpp/include/qpid/swig_perl_typemaps.i b/qpid/cpp/include/qpid/swig_perl_typemaps.i
+index da24bfe..74d2b07 100644
+--- a/qpid/cpp/include/qpid/swig_perl_typemaps.i
++++ b/qpid/cpp/include/qpid/swig_perl_typemaps.i
+@@ -120,7 +120,7 @@
+             }
+             }
+         } catch (qpid::types::Exception& ex) {
+-            Perl_croak(aTHX_ ex.what());
++          Perl_croak(aTHX_ "%s", ex.what());
+         }
+ 
+         if (!result)
+diff --git a/qpid/cpp/include/qpid/swig_ruby_typemaps.i b/qpid/cpp/include/qpid/swig_ruby_typemaps.i
+index 1a07cc8..4e07088 100644
+--- a/qpid/cpp/include/qpid/swig_ruby_typemaps.i
++++ b/qpid/cpp/include/qpid/swig_ruby_typemaps.i
+@@ -106,7 +106,7 @@
+             }
+         } catch (qpid::types::Exception& ex) {
+             static VALUE error = rb_define_class("Error", rb_eStandardError);
+-            rb_raise(error, ex.what());
++            rb_raise(error, "%s", ex.what());
+         }
+ 
+         return result;
+-- 
+1.8.5.3
+
diff --git a/qpid-qmf.spec b/qpid-qmf.spec
index 76ee773..4cf3472 100644
--- a/qpid-qmf.spec
+++ b/qpid-qmf.spec
@@ -12,6 +12,7 @@ URL:     http://qpid.apache.org
 Source0: http://www.apache.org/dist/qpid/%{version}/qpid-%{version}.tar.gz
 Patch0: 00-QPID-5273-Fixed-installing-the-qmfgen-Python-package.patch
 Patch1: 01-NO-JIRA-Add-explicit-language-references-to-all-sheb.patch
+Patch2: 02-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch
 
 BuildRequires: cmake
 BuildRequires: swig
@@ -128,6 +129,7 @@ for ruby.
 
 %patch0 -p2
 %patch1 -p2
+%patch2 -p2
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
 
@@ -243,6 +245,7 @@ rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
 %changelog
 * Mon Feb  3 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.24-16
 - Fix dependencies onto qpid-cpp packages to be >= 0.24.
+- Fixed building with -Werror=format-security enabled.
 
 * Thu Oct 31 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.24-15
 - First separate build of QMF packages for Fedora.