[qpid-cpp/f20] Set qpidd service to start after the network service.
Darryl L. Pierce
mcpierce at fedoraproject.org
Wed Jan 22 18:56:52 UTC 2014
commit 8dcb757d383c65102cdab6d523e689f715e21768
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date: Tue Jan 21 10:43:20 2014 -0500
Set qpidd service to start after the network service.
- Resolves: BZ#1055660
Updated conditions to prevent ARM from failing.
...JIRA-qpidd.service-file-for-use-on-Fedora.patch | 15 ++--
...ix-Ruby-bindings-when-built-with-Werror-f.patch | 83 ++++++++++++++++++++
qpid-cpp.spec | 42 +++++++---
3 files changed, 120 insertions(+), 20 deletions(-)
---
diff --git a/01-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch b/01-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
index bee46ca..92e1ded 100644
--- a/01-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
+++ b/01-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
@@ -1,25 +1,26 @@
-From b83805f5da4fe8566c3107617b262fdc745b9798 Mon Sep 17 00:00:00 2001
+From c77f3a1fd1d93260d57b5e1e9b0792ccc2beb6bb Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <mcpierce at gmail.com>
Date: Wed, 3 Apr 2013 10:07:37 -0400
-Subject: [PATCH 1/2] NO-JIRA: qpidd.service file for use on Fedora
+Subject: [PATCH] NO-JIRA: qpidd.service file for use on Fedora
This patch provides the needed systemd file for running the Qpid broker
as a service.
---
- qpid/cpp/etc/qpidd.service | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
+ qpid/cpp/etc/qpidd.service | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
create mode 100644 qpid/cpp/etc/qpidd.service
diff --git a/qpid/cpp/etc/qpidd.service b/qpid/cpp/etc/qpidd.service
new file mode 100644
-index 0000000..d5e36da
+index 0000000..10a99d1
--- /dev/null
+++ b/qpid/cpp/etc/qpidd.service
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,14 @@
+[Unit]
+Description=An AMQP message broker daemon.
+Documentation=man:qpidd(1) http://qpid.apache.org/
+Requires=network.target
++After=network.target
+
+[Service]
+User=qpidd
@@ -30,5 +31,5 @@ index 0000000..d5e36da
+[Install]
+WantedBy=multi-user.target
--
-1.8.3.1
+1.8.4.2
diff --git a/10-QPID-5499-Fix-Ruby-bindings-when-built-with-Werror-f.patch b/10-QPID-5499-Fix-Ruby-bindings-when-built-with-Werror-f.patch
new file mode 100644
index 0000000..cd2927e
--- /dev/null
+++ b/10-QPID-5499-Fix-Ruby-bindings-when-built-with-Werror-f.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.4.2
+
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index b713c84..99075b1 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -21,13 +21,25 @@
Name: qpid-cpp
Version: 0.24
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Libraries for Qpid C++ client applications
License: ASL 2.0
URL: http://qpid.apache.org
Source0: http://www.apache.org/dist/qpid/%{version}/qpid-%{version}.tar.gz
+Patch1: 01-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
+Patch2: 02-QPID-4670-Move-to-proton-0.5-remove-dummy-string-in-.patch
+Patch3: 03-QPID-5122-cleaner-encoding-of-index-for-delivery-tag.patch
+Patch4: 04-QPID-5123-Changes-to-Fedora-19-packaging-of-libdb4-p.patch
+Patch5: 05-QPID-5016-Zero-rmgr-struct-element-with-correct-size.patch
+Patch6: 06-QPID-5126-Fix-for-building-legacy-store-on-ARM-platf.patch
+Patch7: 07-QPID-4582-Get-legacystore-unit-tests-working.patch
+Patch8: 08-QPID-4582-Fixed-unit-legacystore-unit-test-to-remove.patch
+Patch9: 09-QPID-5129-Alignment-issues-on-ARM.patch
+Patch10: 10-QPID-5499-Fix-Ruby-bindings-when-built-with-Werror-f.patch
+
+
BuildRequires: cmake
BuildRequires: boost-devel
BuildRequires: libtool
@@ -60,17 +72,6 @@ BuildRequires: libaio-devel
BuildRequires: qpid-proton-c-devel%{?_isa} >= 0.5
-Patch1: 01-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
-Patch2: 02-QPID-4670-Move-to-proton-0.5-remove-dummy-string-in-.patch
-Patch3: 03-QPID-5122-cleaner-encoding-of-index-for-delivery-tag.patch
-Patch4: 04-QPID-5123-Changes-to-Fedora-19-packaging-of-libdb4-p.patch
-Patch5: 05-QPID-5016-Zero-rmgr-struct-element-with-correct-size.patch
-Patch6: 06-QPID-5126-Fix-for-building-legacy-store-on-ARM-platf.patch
-Patch7: 07-QPID-4582-Get-legacystore-unit-tests-working.patch
-Patch8: 08-QPID-4582-Fixed-unit-legacystore-unit-test-to-remove.patch
-Patch9: 09-QPID-5129-Alignment-issues-on-ARM.patch
-
-
%description
Run-time libraries for AMQP client applications developed using Qpid
@@ -109,8 +110,12 @@ the AMQP protocol.
%{_libdir}/libqpidtypes.so*
%{_libdir}/libqpidmessaging.so*
%dir %{_libdir}/qpid
+
+%ifnarch %{arm}
%{_libdir}/qpid/client/*
%exclude %{_libdir}/qpid/client/rdmaconnector.so*
+%endif
+
%dir %{_sysconfdir}/qpid
%config(noreplace) %{_sysconfdir}/qpid/qpidc.conf
@@ -418,6 +423,7 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
%patch7 -p2
%patch8 -p2
%patch9 -p2
+%patch10 -p2
%global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
@@ -516,7 +522,7 @@ rm -rf %{buildroot}
%exclude %{python_sitelib}/qmfgen
%{_libdir}/pkgconfig/qmf2.pc
%exclude %{python_sitelib}/qpidtoollibs
-%exclude %{python_sitearch}/qmf
+
%exclude %{python_sitearch}/cqpid.py*
%exclude %{python_sitearch}/_cqpid.so
%exclude %{python_sitearch}/qmf.py*
@@ -529,12 +535,22 @@ rm -rf %{buildroot}
%exclude %{python_sitearch}/mllib
%exclude %{python_sitearch}/qpid
%exclude %{python_sitearch}/*.egg-info
+
+%ifnarch %{arm}
+%exclude %{python_sitearch}/qmf
%exclude %{ruby_vendorlibdir}/qmf*
%exclude %{ruby_vendorarchdir}/cqpid.so
%exclude %{ruby_vendorarchdir}/*qmf*
+%endif
%changelog
+* Wed Jan 22 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.24-9
+- Set qpidd service to start after the network service.
+- QPID-5499: Updated the Swig descriptors.
+- Resolves: BZ#1055660
+- Resolves: BZ#1037295
+
* Sat Nov 30 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.24-8
- Removed rdma.so from the -server subpackage.
- Removed rdmaconnector.so from the -client subpackage.
More information about the scm-commits
mailing list