[qpid-cpp] Rebased on Qpid 0.24.
Darryl L. Pierce
mcpierce at fedoraproject.org
Fri Sep 20 15:48:27 UTC 2013
commit deeb217461376ae79eacd267a3d40ccc0a292058
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date: Fri Sep 20 11:09:57 2013 -0400
Rebased on Qpid 0.24.
- Relocated qpidd.conf to /etc/qpid
- Trimmed old changelog entries due to bogus date complaints.
- Added fixes to support ARM as a primary platform.
- Build depends on qpid-proton 0.5.
- QPID-4938: Stop building ssl and acl support as separate plugin modules on Unix
- Cleaner encoding of index for delivery tags - QPID-5122
- QPID-5123: Changes to Fedora 19 packaging of libdb4 prevents legacystore from building
- QPID-5016: Legacy store not correctly initialising rmgr
- QPID-5126: Fix for building legacy store on ARM platforms
.gitignore | 1 +
...JIRA-qpidd.service-file-for-use-on-Fedora.patch | 10 +-
...ove-to-proton-0.5-remove-dummy-string-in-.patch | 206 +++++++++
02-QPID-4826-Patch-Perl-bindings-memory-leak.patch | 103 -----
03-QPID-4843-Fixed-the-Perl-spout.pl-example.patch | 29 --
...leaner-encoding-of-index-for-delivery-tag.patch | 81 ++++
...4857-Fixed-passing-Perl-Message-to-C-code.patch | 47 --
...hanges-to-Fedora-19-packaging-of-libdb4-p.patch | 117 +++++
...-4885-C-examples-install-to-qpid-examples.patch | 38 --
...ero-rmgr-struct-element-with-correct-size.patch | 26 ++
...nly-installs-the-Swig-descriptors-in-usr-.patch | 33 --
...ix-for-building-legacy-store-on-ARM-platf.patch | 35 ++
...25-Add-SOVERSION-link-to-shared-libraries.patch | 163 -------
qpid-cpp.spec | 472 ++------------------
sources | 2 +-
15 files changed, 506 insertions(+), 857 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 64618fe..82f42d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ store-0.7.3975.tar.gz
/store-0.22.4521.tar.gz
/qpid-cpp-0.22.tgz
/qpid-cpp-0.22.tar.gz
+/qpid-0.24.tar.gz
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 b746cb3..bee46ca 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,7 +1,7 @@
-From e4cd249cc5f804b85e8ae2063dcc32edc24c5dd9 Mon Sep 17 00:00:00 2001
+From b83805f5da4fe8566c3107617b262fdc745b9798 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/6] NO-JIRA: qpidd.service file for use on Fedora
+Subject: [PATCH 1/2] NO-JIRA: qpidd.service file for use on Fedora
This patch provides the needed systemd file for running the Qpid broker
as a service.
@@ -12,7 +12,7 @@ as a service.
diff --git a/qpid/cpp/etc/qpidd.service b/qpid/cpp/etc/qpidd.service
new file mode 100644
-index 0000000..a654983
+index 0000000..d5e36da
--- /dev/null
+++ b/qpid/cpp/etc/qpidd.service
@@ -0,0 +1,13 @@
@@ -25,10 +25,10 @@ index 0000000..a654983
+User=qpidd
+Group=qpidd
+Type=simple
-+ExecStart=/usr/sbin/qpidd --config /etc/qpidd.conf
++ExecStart=/usr/sbin/qpidd --config /etc/qpid/qpidd.conf
+
+[Install]
+WantedBy=multi-user.target
--
-1.8.1.4
+1.8.3.1
diff --git a/02-QPID-4670-Move-to-proton-0.5-remove-dummy-string-in-.patch b/02-QPID-4670-Move-to-proton-0.5-remove-dummy-string-in-.patch
new file mode 100644
index 0000000..7809685
--- /dev/null
+++ b/02-QPID-4670-Move-to-proton-0.5-remove-dummy-string-in-.patch
@@ -0,0 +1,206 @@
+From c909dac986a38640e9b17da4c91c803f5d6c28dd Mon Sep 17 00:00:00 2001
+From: Gordon Sim <gsim at apache.org>
+Date: Wed, 28 Aug 2013 12:41:14 +0000
+Subject: [PATCH 2/2] QPID-4670: Move to proton 0.5, remove dummy string in
+ address for dynamic nodes
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1518180 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/cpp/src/amqp.cmake | 4 ++--
+ qpid/cpp/src/qpid/broker/amqp/Connection.cpp | 3 ---
+ qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp | 9 ++++-----
+ qpid/cpp/src/qpid/broker/amqp/Relay.cpp | 13 +++++++------
+ qpid/cpp/src/qpid/broker/amqp/Relay.h | 5 +++--
+ qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp | 3 ---
+ qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp | 5 -----
+ 7 files changed, 16 insertions(+), 26 deletions(-)
+
+diff --git a/qpid/cpp/src/amqp.cmake b/qpid/cpp/src/amqp.cmake
+index 30cb848..9dfd320 100644
+--- a/qpid/cpp/src/amqp.cmake
++++ b/qpid/cpp/src/amqp.cmake
+@@ -24,8 +24,8 @@ include(FindPkgConfig)
+ pkg_check_modules(PROTON libqpid-proton)
+
+ set (amqp_default ${amqp_force})
+-set (minimum_version 0.3)
+-set (maximum_version 0.4)
++set (minimum_version 0.5)
++set (maximum_version 0.5)
+ if (PROTON_FOUND)
+ if (PROTON_VERSION LESS ${minimum_version})
+ message(STATUS "Qpid proton ${PROTON_VERSION} is too old, require ${minimum_version} - ${maximum_version}; amqp 1.0 support not enabled")
+diff --git a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
+index 2cb0994..d422124 100644
+--- a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
++++ b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
+@@ -182,12 +182,9 @@ void Connection::open()
+
+ void Connection::readPeerProperties()
+ {
+- /**
+- * TODO: enable when proton 0.5 has been released:
+ qpid::types::Variant::Map properties;
+ DataReader::read(pn_connection_remote_properties(connection), properties);
+ setPeerProperties(properties);
+- */
+ }
+
+ void Connection::closed()
+diff --git a/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
+index 68ff979..eb18582 100644
+--- a/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
++++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
+@@ -118,20 +118,19 @@ void OutgoingFromQueue::handle(pn_delivery_t* delivery)
+ if (r.disposition) {
+ switch (r.disposition) {
+ case PN_ACCEPTED:
+- //TODO: only if consuming
+- queue->dequeue(0, r.cursor);
++ if (preAcquires()) queue->dequeue(0, r.cursor);
+ outgoingMessageAccepted();
+ break;
+ case PN_REJECTED:
+- queue->reject(r.cursor);
++ if (preAcquires()) queue->reject(r.cursor);
+ outgoingMessageRejected();
+ break;
+ case PN_RELEASED:
+- queue->release(r.cursor, false);//TODO: for PN_RELEASED, delivery count should not be incremented
++ if (preAcquires()) queue->release(r.cursor, false);//TODO: for PN_RELEASED, delivery count should not be incremented
+ outgoingMessageRejected();//TODO: not quite true...
+ break;
+ case PN_MODIFIED:
+- queue->release(r.cursor, true);//TODO: proper handling of modified
++ if (preAcquires()) queue->release(r.cursor, true);//TODO: proper handling of modified
+ outgoingMessageRejected();//TODO: not quite true...
+ break;
+ default:
+diff --git a/qpid/cpp/src/qpid/broker/amqp/Relay.cpp b/qpid/cpp/src/qpid/broker/amqp/Relay.cpp
+index a08971c..83b3e64 100644
+--- a/qpid/cpp/src/qpid/broker/amqp/Relay.cpp
++++ b/qpid/cpp/src/qpid/broker/amqp/Relay.cpp
+@@ -105,14 +105,14 @@ void Relay::detached(Outgoing*)
+ {
+ out = 0;
+ isDetached = true;
+- std::cerr << "Outgoing link detached from relay" << std::endl;
++ QPID_LOG(info, "Outgoing link detached from relay [" << this << "]");
+ if (in) in->wakeup();
+ }
+ void Relay::detached(Incoming*)
+ {
+ in = 0;
+ isDetached = true;
+- std::cerr << "Incoming link detached from relay" << std::endl;
++ QPID_LOG(info, "Incoming link detached from relay [" << this << "]");
+ if (out) out->wakeup();
+ }
+
+@@ -139,13 +139,13 @@ void OutgoingFromRelay::handle(pn_delivery_t* delivery)
+ if (pn_delivery_writable(delivery)) {
+ if (transfer->write(link)) {
+ outgoingMessageSent();
+- QPID_LOG(debug, "Sent relayed message " << name);
++ QPID_LOG(debug, "Sent relayed message " << name << " [" << relay.get() << "]");
+ } else {
+- QPID_LOG(error, "Failed to send relayed message " << name);
++ QPID_LOG(error, "Failed to send relayed message " << name << " [" << relay.get() << "]");
+ }
+ }
+ if (pn_delivery_updated(delivery)) {
+- pn_disposition_t d = transfer->updated();
++ uint64_t d = transfer->updated();
+ switch (d) {
+ case PN_ACCEPTED:
+ outgoingMessageAccepted();
+@@ -226,6 +226,7 @@ void IncomingToRelay::detached()
+ relay->detached(this);
+ }
+
++BufferedTransfer::BufferedTransfer() : disposition(0) {}
+ void BufferedTransfer::initIn(pn_link_t* link, pn_delivery_t* d)
+ {
+ in.handle = d;
+@@ -264,7 +265,7 @@ void BufferedTransfer::initOut(pn_link_t* link)
+ pn_delivery_set_context(out.handle, this);
+ }
+
+-pn_disposition_t BufferedTransfer::updated()
++uint64_t BufferedTransfer::updated()
+ {
+ disposition = pn_delivery_remote_state(out.handle);
+ if (disposition) {
+diff --git a/qpid/cpp/src/qpid/broker/amqp/Relay.h b/qpid/cpp/src/qpid/broker/amqp/Relay.h
+index 0c2d48b..ef70069 100644
+--- a/qpid/cpp/src/qpid/broker/amqp/Relay.h
++++ b/qpid/cpp/src/qpid/broker/amqp/Relay.h
+@@ -45,10 +45,11 @@ struct Delivery
+ class BufferedTransfer
+ {
+ public:
++ BufferedTransfer();
+ void initIn(pn_link_t* link, pn_delivery_t* d);
+ bool settle();
+ void initOut(pn_link_t* link);
+- pn_disposition_t updated();
++ uint64_t updated();
+ bool write(pn_link_t*);
+ private:
+ std::vector<char> data;
+@@ -56,7 +57,7 @@ class BufferedTransfer
+ Delivery out;
+ pn_delivery_tag_t dt;
+ std::vector<char> tag;
+- pn_disposition_t disposition;
++ uint64_t disposition;
+ };
+
+ /**
+diff --git a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
+index 9ecb46d..0f3d4e4 100644
+--- a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
++++ b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
+@@ -83,8 +83,6 @@ const std::string DELETE_IF_EMPTY("delete-if-empty");
+ const std::string DELETE_IF_UNUSED_AND_EMPTY("delete-if-unused-and-empty");
+ const std::string CREATE_ON_DEMAND("create-on-demand");
+
+-const std::string DUMMY(".");
+-
+ const std::string X_DECLARE("x-declare");
+ const std::string X_BINDINGS("x-bindings");
+ const std::string X_SUBSCRIBE("x-subscribe");
+@@ -506,7 +504,6 @@ void AddressHelper::configure(pn_terminus_t* terminus, CheckMode mode)
+ bool createOnDemand(false);
+ if (isTemporary) {
+ //application expects a name to be generated
+- pn_terminus_set_address(terminus, DUMMY.c_str());//workaround for PROTON-277
+ pn_terminus_set_dynamic(terminus, true);
+ setNodeProperties(terminus);
+ } else {
+diff --git a/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
+index c9b7c1a..a7c0f65 100644
+--- a/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
++++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
+@@ -742,10 +742,6 @@ pn_bytes_t convert(const std::string& s)
+ }
+ void ConnectionContext::setProperties()
+ {
+- /**
+- * Enable when proton 0.5 is released and qpidc has been updated
+- * to use it
+- *
+ pn_data_t* data = pn_connection_properties(connection);
+ pn_data_put_map(data);
+ pn_data_enter(data);
+@@ -760,7 +756,6 @@ void ConnectionContext::setProperties()
+ pn_data_put_symbol(data, convert(CLIENT_PPID));
+ pn_data_put_int(data, sys::SystemInfo::getParentProcessId());
+ pn_data_exit(data);
+- **/
+ }
+
+ const qpid::sys::SecuritySettings* ConnectionContext::getTransportSecuritySettings()
+--
+1.8.3.1
+
diff --git a/03-QPID-5122-cleaner-encoding-of-index-for-delivery-tag.patch b/03-QPID-5122-cleaner-encoding-of-index-for-delivery-tag.patch
new file mode 100644
index 0000000..f762eac
--- /dev/null
+++ b/03-QPID-5122-cleaner-encoding-of-index-for-delivery-tag.patch
@@ -0,0 +1,81 @@
+From 69d1ac622c2db4d357365d03e26eb34c8b992a44 Mon Sep 17 00:00:00 2001
+From: Gordon Sim <gsim at apache.org>
+Date: Tue, 10 Sep 2013 11:03:20 +0000
+Subject: [PATCH] QPID-5122: cleaner encoding of index for delivery tags
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1521433 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp | 18 ++++++++++++++----
+ qpid/cpp/src/qpid/broker/amqp/Outgoing.h | 3 +++
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
+index eb18582..5bcdf67 100644
+--- a/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
++++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
+@@ -29,6 +29,7 @@
+ #include "qpid/sys/OutputControl.h"
+ #include "qpid/amqp/descriptors.h"
+ #include "qpid/amqp/MessageEncoder.h"
++#include "qpid/framing/Buffer.h"
+ #include "qpid/framing/reply_exceptions.h"
+ #include "qpid/log/Statement.h"
+
+@@ -91,8 +92,7 @@ void OutgoingFromQueue::write(const char* data, size_t size)
+
+ void OutgoingFromQueue::handle(pn_delivery_t* delivery)
+ {
+- pn_delivery_tag_t tag = pn_delivery_tag(delivery);
+- size_t i = *reinterpret_cast<const size_t*>(tag.bytes);
++ size_t i = Record::getIndex(pn_delivery_tag(delivery));
+ Record& r = deliveries[i];
+ if (pn_delivery_writable(delivery)) {
+ assert(r.msg);
+@@ -254,8 +254,10 @@ OutgoingFromQueue::Record::Record() : delivery(0), disposition(0), index(0) {}
+ void OutgoingFromQueue::Record::init(size_t i)
+ {
+ index = i;
+- tag.bytes = reinterpret_cast<const char*>(&index);
+- tag.size = sizeof(index);
++ qpid::framing::Buffer buffer(tagData, Record::TAG_WIDTH);
++ buffer.putUInt<Record::TAG_WIDTH>(index);
++ tag.bytes = tagData;
++ tag.size = Record::TAG_WIDTH;
+ }
+ void OutgoingFromQueue::Record::reset()
+ {
+@@ -265,5 +267,13 @@ void OutgoingFromQueue::Record::reset()
+ disposition = 0;
+ }
+
++size_t OutgoingFromQueue::Record::getIndex(pn_delivery_tag_t t)
++{
++ assert(t.size == TAG_WIDTH);
++ qpid::framing::Buffer buffer(const_cast<char*>(t.bytes)/*won't ever be written to*/, t.size);
++ return (size_t) buffer.getUInt<TAG_WIDTH>();
++}
++
++
+
+ }}} // namespace qpid::broker::amqp
+diff --git a/qpid/cpp/src/qpid/broker/amqp/Outgoing.h b/qpid/cpp/src/qpid/broker/amqp/Outgoing.h
+index 86d7d46..b53f67f 100644
+--- a/qpid/cpp/src/qpid/broker/amqp/Outgoing.h
++++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.h
+@@ -117,10 +117,13 @@ class OutgoingFromQueue : public Outgoing, public qpid::broker::Consumer, public
+ int disposition;
+ size_t index;
+ pn_delivery_tag_t tag;
++ static const size_t TAG_WIDTH = sizeof(size_t);
++ char tagData[TAG_WIDTH];//index in encoded form, used for tag
+
+ Record();
+ void init(size_t i);
+ void reset();
++ static size_t getIndex(pn_delivery_tag_t);
+ };
+
+ const bool exclusive;
+--
+1.8.3.1
+
diff --git a/04-QPID-5123-Changes-to-Fedora-19-packaging-of-libdb4-p.patch b/04-QPID-5123-Changes-to-Fedora-19-packaging-of-libdb4-p.patch
new file mode 100644
index 0000000..c0aadf6
--- /dev/null
+++ b/04-QPID-5123-Changes-to-Fedora-19-packaging-of-libdb4-p.patch
@@ -0,0 +1,117 @@
+From e9ec612f443e666df8d54c3a2ab1a7f7d0507326 Mon Sep 17 00:00:00 2001
+From: Kim van der Riet <kpvdr at apache.org>
+Date: Tue, 10 Sep 2013 01:48:58 +0000
+Subject: [PATCH] QPID-5123: Changes to Fedora 19 packaging of libdb4 prevents
+ legacystore from building
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1521335 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/cpp/src/finddb.cmake | 20 +++++++++++---------
+ qpid/cpp/src/legacystore.cmake | 4 ++--
+ qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp | 2 +-
+ 3 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/qpid/cpp/src/finddb.cmake b/qpid/cpp/src/finddb.cmake
+index fad827c..2f2f94f 100644
+--- a/qpid/cpp/src/finddb.cmake
++++ b/qpid/cpp/src/finddb.cmake
+@@ -22,31 +22,33 @@ if(UNIX)
+ # - Find BerkeleyDB
+ # Find the BerkeleyDB includes and library
+ # This module defines
+-# DB_INCLUDE_DIR, where to find db.h, etc.
++# DB_CXX_INCLUDE_DIR, where to find db_cxx.h, etc.
+ # DB_LIBRARIES, the libraries needed to use BerkeleyDB.
+ # DB_FOUND, If false, do not try to use BerkeleyDB.
+ # also defined, but not for general use are
+ # DB_LIBRARY, where to find the BerkeleyDB library.
+
+-FIND_PATH(DB_INCLUDE_DIR db.h
++FIND_PATH(DB_CXX_INCLUDE_DIR db_cxx.h
+ /usr/local/include/db4
++ /usr/local/include/libdb4
+ /usr/local/include
+ /usr/include/db4
++ /usr/include/libdb4
+ /usr/include
+ )
+
+-SET(DB_NAMES ${DB_NAMES} db_cxx)
++SET(DB_NAMES ${DB_NAMES} db_cxx db_cxx-4)
+ FIND_LIBRARY(DB_LIBRARY
+ NAMES ${DB_NAMES}
+ PATHS /usr/lib /usr/local/lib
+ )
+
+-IF (DB_LIBRARY AND DB_INCLUDE_DIR)
++IF (DB_LIBRARY AND DB_CXX_INCLUDE_DIR)
+ SET(DB_LIBRARIES ${DB_LIBRARY})
+ SET(DB_FOUND "YES")
+-ELSE (DB_LIBRARY AND DB_INCLUDE_DIR)
++ELSE (DB_LIBRARY AND DB_CXX_INCLUDE_DIR)
+ UNSET( DB_FOUND )
+-ENDIF (DB_LIBRARY AND DB_INCLUDE_DIR)
++ENDIF (DB_LIBRARY AND DB_CXX_INCLUDE_DIR)
+
+
+ IF (DB_FOUND)
+@@ -60,15 +62,15 @@ ELSE (DB_FOUND)
+ ENDIF (DB_FOUND)
+
+ # Deprecated declarations.
+-SET (NATIVE_DB_INCLUDE_PATH ${DB_INCLUDE_DIR} )
++SET (NATIVE_DB_INCLUDE_PATH ${DB_CXX_INCLUDE_DIR} )
+ GET_FILENAME_COMPONENT (NATIVE_DB_LIB_PATH ${DB_LIBRARY} PATH)
+
+ MARK_AS_ADVANCED(
+ DB_LIBRARY
+- DB_INCLUDE_DIR
++ DB_CXX_INCLUDE_DIR
+ )
+
+ else(UNIX)
+ MESSAGE(STATUS "BerkeleyDB is ignored on non-Unix platforms")
+ UNSET( DB_FOUND )
+-endif(UNIX)
+\ No newline at end of file
++endif(UNIX)
+diff --git a/qpid/cpp/src/legacystore.cmake b/qpid/cpp/src/legacystore.cmake
+index 9d6876b..1fdb51a 100644
+--- a/qpid/cpp/src/legacystore.cmake
++++ b/qpid/cpp/src/legacystore.cmake
+@@ -126,10 +126,10 @@ if (BUILD_LEGACYSTORE)
+ )
+
+ if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/db-inc.h)
+- message(STATUS "Including BDB from ${DB_INCLUDE_DIR}/db_cxx.h")
++ message(STATUS "Including BDB from ${DB_CXX_INCLUDE_DIR}/db_cxx.h")
+ file(WRITE
+ ${CMAKE_CURRENT_BINARY_DIR}/db-inc.h
+- "#include <${DB_INCLUDE_DIR}/db_cxx.h>\n")
++ "#include <${DB_CXX_INCLUDE_DIR}/db_cxx.h>\n")
+ endif()
+
+ add_library (legacystore MODULE
+diff --git a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
+index c92c982..4db2790 100644
+--- a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
++++ b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
+@@ -21,6 +21,7 @@
+
+ #include "qpid/legacystore/MessageStoreImpl.h"
+
++#include "db-inc.h"
+ #include "qpid/broker/QueueSettings.h"
+ #include "qpid/legacystore/BindingDbt.h"
+ #include "qpid/legacystore/BufferValue.h"
+@@ -31,7 +32,6 @@
+ #include "qmf/org/apache/qpid/legacystore/Package.h"
+ #include "qpid/legacystore/StoreException.h"
+ #include <dirent.h>
+-#include <db.h>
+
+ #define MAX_AIO_SLEEPS 100000 // tot: ~1 sec
+ #define AIO_SLEEP_TIME_US 10 // 0.01 ms
+--
+1.8.3.1
+
diff --git a/05-QPID-5016-Zero-rmgr-struct-element-with-correct-size.patch b/05-QPID-5016-Zero-rmgr-struct-element-with-correct-size.patch
new file mode 100644
index 0000000..fb8fadd
--- /dev/null
+++ b/05-QPID-5016-Zero-rmgr-struct-element-with-correct-size.patch
@@ -0,0 +1,26 @@
+From ba91d731c6dc24c012b6abb3ceb5b14d0f7ae8f7 Mon Sep 17 00:00:00 2001
+From: Andrew Stitcher <astitcher at apache.org>
+Date: Thu, 25 Jul 2013 18:39:52 +0000
+Subject: [PATCH] QPID-5016: Zero rmgr struct element with correct size.
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1507085 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
+index 3a11817..204affd 100644
+--- a/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
++++ b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
+@@ -72,7 +72,7 @@ rmgr::initialize(aio_callback* const cbp)
+ throw jexception(jerrno::JERR__MALLOC, oss.str(), "rmgr", "initialize");
+ }
+ _fhdr_aio_cb_ptr = new aio_cb;
+- std::memset(_fhdr_aio_cb_ptr, 0, sizeof(aio_cb*));
++ std::memset(_fhdr_aio_cb_ptr, 0, sizeof(aio_cb));
+ }
+
+ void
+--
+1.8.3.1
+
diff --git a/06-QPID-5126-Fix-for-building-legacy-store-on-ARM-platf.patch b/06-QPID-5126-Fix-for-building-legacy-store-on-ARM-platf.patch
new file mode 100644
index 0000000..c4b6aab
--- /dev/null
+++ b/06-QPID-5126-Fix-for-building-legacy-store-on-ARM-platf.patch
@@ -0,0 +1,35 @@
+From 0bd06fdd4d4bcbef63de1e2ee4a1e4cee9b0d7f4 Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <mcpierce at apache.org>
+Date: Tue, 10 Sep 2013 20:24:29 +0000
+Subject: [PATCH] QPID-5126: Fix for building legacy store on ARM platforms
+
+Contributed by: Kim van der Riet <kim.vdriet at redhat.com>
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1521629 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h b/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h
+index 0a0d0df..01d92ee 100644
+--- a/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h
++++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h
+@@ -33,13 +33,13 @@
+ #ifndef QPID_LEGACYSTORE_JRNL_JCFG_H
+ #define QPID_LEGACYSTORE_JRNL_JCFG_H
+
+-#if defined(__i386__) /* little endian, 32 bits */
++#if defined(__i386__) || (__arm__) /* little endian, 32 bits */
+ #define JRNL_LITTLE_ENDIAN
+ #define JRNL_32_BIT
+ #elif defined(__PPC__) || defined(__s390__) /* big endian, 32 bits */
+ #define JRNL_BIG_ENDIAN
+ #define JRNL_32_BIT
+-#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) /* little endian, 64 bits */
++#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || (__arm64__) /* little endian, 64 bits */
+ #define JRNL_LITTLE_ENDIAN
+ #define JRNL_64_BIT
+ #elif defined(__powerpc64__) || defined(__s390x__) /* big endian, 64 bits */
+--
+1.8.3.1
+
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 41ad882..225f3b6 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -1,4 +1,7 @@
-# qpid-cpp
+# qpid-cpp
+
+# Define pkgdocdir for releases that don't define it already
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -20,18 +23,18 @@
%global RDMAWRAP_VERSION_INFO 5:0:0
%global SSLCOMMON_VERSION_INFO 5:0:0
-# Single var with all lib version params (except store) for make
-%global LIB_VERSION_MAKE_PARAMS QPIDCOMMON_VERSION_INFO=%{QPIDCOMMON_VERSION_INFO} QPIDBROKER_VERSION_INFO=%{QPIDBROKER_VERSION_INFO} QPIDCLIENT_VERSION_INFO=%{QPIDCLIENT_VERSION_INFO} QPIDMESSAGING_VERSION_INFO=%{QPIDMESSAGING_VERSION_INFO} QMF_VERSION_INFO=%{QMF_VERSION_INFO} QMFENGINE_VERSION_INFO=%{QMFENGINE_VERSION_INFO} QMFCONSOLE_VERSION_INFO=%{QMFCONSOLE_VERSION_INFO} RDMAWRAP_VERSION_INFO=%{RDMAWRAP_VERSION_INFO} SSLCOMMON_VERSION_INFO=%{SSLCOMMON_VERSION_INFO}
-
Name: qpid-cpp
-Version: 0.22
-Release: 4%{?dist}
+Version: 0.24
+Release: 1%{?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
+Obsoletes: qpid-cpp-client-ssl < 0.24
+Obsoletes: qpid-cpp-server-ssl < 0.24
+
BuildRequires: cmake
BuildRequires: boost-devel
BuildRequires: libtool
@@ -61,15 +64,15 @@ BuildRequires: xerces-c-devel
BuildRequires: libdb-devel
BuildRequires: libdb4-cxx-devel
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-4826-Patch-Perl-bindings-memory-leak.patch
-Patch3: 03-QPID-4843-Fixed-the-Perl-spout.pl-example.patch
-Patch4: 04-QPID-4857-Fixed-passing-Perl-Message-to-C-code.patch
-Patch5: 05-QPID-4885-C-examples-install-to-qpid-examples.patch
-Patch6: 06-QPID-4889-Only-installs-the-Swig-descriptors-in-usr-.patch
-Patch7: 07-QPID-4825-Add-SOVERSION-link-to-shared-libraries.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
%description
@@ -86,6 +89,7 @@ Summary: Libraries for Qpid C++ client applications
Requires: boost
Requires: chkconfig
Requires: initscripts
+Requires: qpid-proton-c%{_isa} >= 0.5
%description -n qpid-cpp-client
Run-time libraries for AMQP client applications developed using Qpid
@@ -161,7 +165,7 @@ in C++ using Qpid. Qpid implements the AMQP messaging specification.
%{_bindir}/qpid-latency-test
%{_bindir}/qpid-client-test
%{_bindir}/qpid-txtest
-%{_datadir}/qpid/examples
+# %{_datadir}/qpid/examples
%{_libexecdir}/qpid/tests
%post -n qpid-cpp-client-devel -p /sbin/ldconfig
@@ -181,7 +185,7 @@ format for easy browsing.
%files -n qpid-cpp-client-devel-docs
%defattr(-,root,root,-)
-%{_docdir}/qpid-cpp-%{version}
+%doc %{_pkgdocdir}
@@ -193,6 +197,7 @@ Provides: qpid-cpp-server-daemon = %{version}-%{release}
Requires: qpid-cpp-client = %{version}-%{release}
Requires: cyrus-sasl
+Requires: qpid-proton-c%{_isa} >= 0.5
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -207,7 +212,7 @@ the open AMQP messaging protocol.
%{_libdir}/libqpidbroker.so*
%{_sbindir}/qpidd
%{_unitdir}/qpidd.service
-%config(noreplace) %{_sysconfdir}/qpidd.conf
+%config(noreplace) %{_sysconfdir}/qpid/qpidd.conf
%config(noreplace) %{_sysconfdir}/sasl2/qpidd.conf
%{_libdir}/qpid/daemon/*
%attr(755, qpidd, qpidd) %{_localstatedir}/lib/qpidd
@@ -444,46 +449,6 @@ transport for AMQP messaging.
-%package -n qpid-cpp-client-ssl
-Summary: SSL support for Qpid clients
-
-Requires: qpid-cpp-client = %{version}-%{release}
-
-%description -n qpid-cpp-client-ssl
-A client plugin and support library to support SSL as the transport
-for Qpid messaging.
-
-%files -n qpid-cpp-client-ssl
-%defattr(-,root,root,-)
-%{_libdir}/libsslcommon.so*
-%{_libdir}/qpid/client/sslconnector.so
-
-%post -n qpid-cpp-client-ssl -p /sbin/ldconfig
-
-%postun -n qpid-cpp-client-ssl -p /sbin/ldconfig
-
-
-
-%package -n qpid-cpp-server-ssl
-Summary: SSL support for the Qpid daemon
-
-Requires: qpid-cpp-server = %{version}-%{release}
-Requires: qpid-cpp-client-ssl = %{version}-%{release}
-
-%description -n qpid-cpp-server-ssl
-A Qpid daemon plugin to support SSL as the transport for AMQP
-messaging.
-
-%files -n qpid-cpp-server-ssl
-%defattr(-,root,root,-)
-%{_libdir}/qpid/daemon/ssl.so
-
-%post -n qpid-cpp-server-ssl -p /sbin/ldconfig
-
-%postun -n qpid-cpp-server-ssl -p /sbin/ldconfig
-
-
-
%package -n qpid-cpp-server-xml
Summary: XML extensions for the Qpid daemon
@@ -567,7 +532,6 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
%patch4 -p2
%patch5 -p2
%patch6 -p2
-%patch7 -p2
%global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
@@ -577,7 +541,7 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
%build
pushd cpp
-%cmake .
+%cmake -DDOC_INSTALL_DIR:PATH=%{_pkgdocdir} .
make %{?_smp_mflags}
make docs-user-api
@@ -677,6 +641,18 @@ rm -rf %{buildroot}
%changelog
+* Mon Sep 20 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.24-1
+- Rebased on Qpid 0.24.
+- Relocated qpidd.conf to /etc/qpid
+- Trimmed old changelog entries due to bogus date complaints.
+- Added fixes to support ARM as a primary platform.
+- Build depends on qpid-proton 0.5.
+- QPID-4938: Stop building ssl and acl support as separate plugin modules on Unix
+- Cleaner encoding of index for delivery tags - QPID-5122
+- QPID-5123: Changes to Fedora 19 packaging of libdb4 prevents legacystore from building
+- QPID-5016: Legacy store not correctly initialising rmgr
+- QPID-5126: Fix for building legacy store on ARM platforms
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -791,7 +767,7 @@ rm -rf %{buildroot}
* Mon Jun 18 2012 Rex Dieter <rdieter at fedoraproject.org> 0.16-1.5
- -server: Obsoletes -server-devel (and so it doesn't Obsoletes itself)
-* Fri Jun 07 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.16-1.4
+* Thu Jun 07 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.16-1.4
- Replaced the dependency on chkconfig and service binaries with packages.
* Wed Jun 06 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.16-1.3
@@ -827,383 +803,3 @@ rm -rf %{buildroot}
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-6.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Dec 08 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 0.12-6.2
-- Fixed the Boost.Singleton issue (thanks to Petr Machata's patch: #761045)
-
-* Wed Dec 07 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 0.12-5.2
-- Rebuilt for Boost-1.48
-
-* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-4.2
-- Rebuilt for glibc bug#747377
-
-* Thu Oct 20 2011 Nuno Santos <nsantos at redhat.com> - 0.12-4.1
-- BZ747351 - python-qpid-qmf has namespace collision
-
-* Thu Sep 22 2011 Nuno Santos <nsantos at redhat.com> - 0.12-3.1
-- BZ705208 - [RFE] qpid needs package config files for dependency usage by autotools
-
-* Tue Sep 20 2011 Nuno Santos <nsantos at redhat.com> - 0.12-2.1
-- Updated patch for qmf-related issues fixed post-0.12
-
-* Tue Aug 30 2011 Nuno Santos <nsantos at redhat.com> - 0.12-1.1
-- Rebased to sync with upstream's official 0.12 release
-
-* Sun Aug 14 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.10-4.1
-- Rebuilt for rpm (#728707)
-
-* Thu Jul 21 2011 Jaroslav Reznik <jreznik at redhat.com> - 0.10-4
-- Rebuilt for boost 1.47.0
-
-* Tue Jun 14 2011 Nuno Santos <nsantos at redhat.com> - 0.10-3
-- BZ709948 - package the perl bindings (patch from jpo at di.uminho.pt)
-
-* Mon May 2 2011 Nuno Santos <nsantos at redhat.com> - 0.10-1
-- Rebased to sync with upstream's official 0.10 release
-
-* Sun Apr 17 2011 Kalev Lember <kalev at smartlink.ee> - 0.8-8
-- Rebuilt for boost 1.46.1 soname bump
-
-* Thu Mar 10 2011 Kalev Lember <kalev at smartlink.ee> - 0.8-7
-- Rebuilt with xerces-c 3.1
-
-* Tue Feb 22 2011 Nuno Santos <nsantos at redhat.com> - 0.8-6
-- BZ661736 - renaming qmf subpackage to qpid-qmf
-
-* Mon Feb 14 2011 Nuno Santos <nsantos at redhat.com> - 0.8-5
-- Updated qmf patch
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-4.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Feb 7 2011 Nuno Santos <nsantos at redhat.com> - 0.8-4
-- BZ671520 - SELinux is preventing /usr/bin/updatedb from 'getattr' accesses on the directory /var/run/qpidd
-
-* Mon Feb 7 2011 Nuno Santos <nsantos at redhat.com> - 0.8-3
-- Updated qmf-related patch, includes previous size_t-related patch
-- New patch to deal with updated boost
-- BZ665366 - qpidd post install is blowing away default SELinux policy
-
-* Thu Jan 21 2011 Dan Horák <dan[at]danny.cz> - 0.8-2
-- fix build with different size_t - https://issues.apache.org/jira/browse/QPID-2996
-
-* Mon Jan 10 2011 Nuno Santos <nsantos at redhat.com> - 0.8-1
-- Rebased to sync with upstream's official 0.8 release, based on svn rev 1037942
-
-* Tue Dec 21 2010 Dan Horák <dan[at]danny.cz> - 0.7.946106-4.1
-- don't build with InfiniBand support on s390(x)
-- don't limit architectures in Fedora
-
-* Mon Nov 29 2010 Nuno Santos <nsantos at redhat.com> - 0.7.946106-4
-- BZ656680 - Update Spec File to use ghost macro on files in /var/run
-
-* Tue Jul 27 2010 Nuno Santos <nsantos at redhat.com> - 0.7.946106-2
-- Patch for autoconf swig version comparison macro
-
-* Tue Jul 22 2010 Nuno Santos <nsantos at redhat.com> - 0.7.946106-1
-- Rebased to sync with mrg
-
-* Mon May 3 2010 Nuno Santos <nsantos at redhat.com> - 0.6.895736-4
-- Patch for qmf.rb
-
-* Tue Apr 6 2010 Nuno Santos <nsantos at redhat.com> - 0.6.895736-3
-- BZ529448 - qpidd should not require selinux-policy-minimum
-
-* Fri Mar 19 2010 Nuno Santos <nsantos at redhat.com> - 0.6.895736-2
-- BZ574880 - Add restorecon to qpid init script
-
-* Tue Mar 2 2010 Kim van der Riet<kim.vdriet at redhat.com> - 0.6.895736-1
-- Imported unified specfile from RHEL maintained by Kim van der Riet
-
-* Mon Feb 8 2010 Nuno Santos <nsantos at nsantos-laptop> - 0.5.829175-4
-- Package rename
-
-* Wed Dec 2 2009 Nuno Santos <nsantos at redhat.com> - 0.5.829175-3
-- Patch for BZ538355
-
-* Tue Nov 3 2009 Nuno Santos <nsantos at redhat.com> - 0.5.829175-2
-- Add patch for qmf fixes
-
-* Fri Oct 23 2009 Nuno Santos <nsantos at redhat.com> - 0.5.829175-1
-- Rebased to svn rev 829175
-
-* Thu Oct 15 2009 Nuno Santos <nsantos at redhat.com> - 0.5.825677-1
-- Rebased to svn rev 825677
-
-* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
-- Rebased to svn rev 819819 for F12 beta
-
-* Thu Sep 24 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
-- Rebased to svn rev 818599
-- rhm-cpp-server-store obsoletes rhm top-level package
-
-* Fri Sep 19 2009 Nuno Santos <nsantos at redhat.com> - 0.5.817349
-- Rebased to svn rev 817349
-
-* Wed Jul 29 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.790661-3
-- Update BuildRequires and Requires to use latest stable versions of
- corosync and clusterlib.
-- Unbreak perftests define (and fix vim spec syntax coloring).
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.790661-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jul 2 2009 Nuno Santos <nsantos at redhat.com> - 0.5.790661-1
-- Rebased to svn rev 790661; .so lib numbers bumped
-
-* Fri Jun 26 2009 Nuno Santos <nsantos at redhat.com> - 0.5.788782-1
-- Rebased to svn rev 788782
-
-* Mon Jun 22 2009 Nuno Santos <nsantos at redhat.com> - 0.5.787286-1
-- Rebased to svn rev 787286
-
-* Wed Jun 10 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.752600-8
-- update BuildRequires to use corosynclib-devel in correct version.
-- update BuildRequires to use clusterlib-devel instead of the obsoleted
- cmanlib-devel.
-- drop Requires on cmanlib. This should come in automatically as part
- of the rpm build process.
-- re-align package version to -8. -7 didn't have a changelog entry?
-- add patch to port Cluster/Cpg to newest Cpg code.
-- change patch tag to use patch0.
-
-* Mon May 4 2009 Nuno Santos <nsantos at redhat.com> - 0.5.752600-5
-- patch for SASL credentials refresh
-
-* Wed Apr 1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.5.752600-5
-- Fix unowned examples directory in -devel pkg.
-
-* Mon Mar 16 2009 Nuno Santos <nsantos at localhost.localdomain> - 0.5.752600-4
-- BZ483925 - split docs into a separate noarch subpackage
-
-* Mon Mar 16 2009 Nuno Santos <nsantos at redhat.com> - 0.5.752600-3
-- Disable auth by default; fix selinux requires
-
-* Wed Mar 11 2009 Nuno Santos <nsantos at redhat.com> - 0.5.752600-1
-- Rebased to svn rev 752600
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.738618-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.738618-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Jan 28 2009 Nuno Santos <nsantos at redhat.com> - 0.4.738618-2
-- Rebased to svn rev 738618
-
-* Tue Jan 20 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-3
-- BZ474614 and BZ474613 - qpidc/rhm unowned directories
-
-* Thu Jan 15 2009 Nuno Santos <nsantos at redhat.com> - 0.4.734452-1
-- Rebased to svn rev 734452
-
-* Tue Dec 23 2008 Nuno Santos <nsantos at redhat.com> - 0.4.728142-1
-- Rebased to svn rev 728142
-- Re-enable cluster, now using corosync
-
-* Tue Dec 2 2008 Nuno Santos <nsantos at redhat.com> - 0.3.722557-1
-- Rebased to svn rev 722557
-- Temporarily disabled cluster due to openais version incompatibility
-
-* Wed Nov 26 2008 Nuno Santos <nsantos at redhat.com> - 0.3.720979-1
-- Rebased to svn rev 720979
-
-* Fri Nov 21 2008 Mick Goulish <mgoulish at redhat.com>
-- updated to 719552
-
-* Thu Nov 20 2008 Mick Goulish <mgoulish at redhat.com>
-- updated to 719323
-- For subpackage qpidd-cluster, added dependency to cman-devel.
-- For subpackage qpidd-cluster, added dependency to qpidc.
-- added BuildRequires cman-devel
-
-* Fri Nov 14 2008 Justin Ross <jross at redhat.com> - 0.3.714072-1
-- Update to svn rev 714072
-- Enable building --with-cpg
-
-* Wed Nov 12 2008 Justin Ross <jross at redhat.com> - 0.3.713378-1
-- Update to svn rev 713378
-
-* Fri Nov 7 2008 Justin Ross <jross at redhat.com> - 0.3.712127-1
-- Update to svn rev 712127
-
-* Thu Nov 6 2008 Nuno Santos <nsantos at redhat.com> - 0.3.711915-2
-- Removed extraneous openais-devel dependency
-
-* Thu Nov 6 2008 Justin Ross <jross at redhat.com> - 0.3.711915-1
-- Update to svn rev 711915
-
-* Tue Nov 4 2008 Nuno Santos <nsantos at redhat.com> - 0.3.709187-2
-- Remove extraneous dependency
-
-* Thu Oct 30 2008 Nuno Santos <nsantos at redhat.com> - 0.3.709187-1
-- Rebsed to svn rev 709187
-
-* Tue Oct 28 2008 Nuno Santos <nsantos at redhat.com> - 0.3.708576-1
-- Rebased to svn rev 708576
-
-* Mon Oct 27 2008 Nuno Santos <nsantos at redhat.com> - 0.3.708210-1
-- Rebased to svn rev 708210; address make check libtool issue
-
-* Fri Oct 24 2008 Justin Ross <jross at redhat.com> - 0.3.707724-1
-- Update to revision 707724
-
-* Thu Oct 23 2008 Justin Ross <jross at redhat.com> - 0.3.707468-1
-- Don't use silly idenity defines
-- Add new ssl and rdma subpackages
-- Move cluster and xml plugins into their own subpackages
-- Reflect new naming of plugins
-
-* Wed Aug 21 2008 Justin Ross <jross at redhat.com> - 0.2.687156-1
-- Update to source revision 687156 of the qpid.0-10 branch
-
-* Wed Aug 14 2008 Justin Ross <jross at redhat.com> - 0.2.685273-1
-- Update to source revision 685273 of the qpid.0-10 branch
-
-* Wed Aug 6 2008 Justin Ross <jross at redhat.com> - 0.2.683301-1
-- Update to source revision 683301 of the qpid.0-10 branch
-
-* Thu Jul 15 2008 Justin Ross <jross at redhat.com> - 0.2.676581-1
-- Update to source revision 676581 of the qpid.0-10 branch
-- Work around home dir creation problem
-- Use a license string that rpmlint likes
-
-* Thu Jul 10 2008 Nuno Santos <nsantos at redhat.com> - 0.2.667603-3
-- BZ453818: added additional tests to -perftest
-
-* Thu Jun 13 2008 Justin Ross <jross at redhat.com> - 0.2.667603-1
-- Update to source revision 667603
-
-* Thu Jun 12 2008 Justin Ross <jross at redhat.com> - 0.2.667253-1
-- Update to source revision 667253
-
-* Thu Jun 12 2008 Nuno Santos <nsantos at redhat.com> - 0.2.666138-5
-- add missing doc files
-
-* Wed Jun 11 2008 Justin Ross <jross at redhat.com> - 0.2.666138-3
-- Added directories for modules and pid files to install script
-
-* Wed May 28 2008 David Sommerseth <dsommers at redhat.com> - 0.2.663761-1
-- Added perftest utilities
-
-* Thu May 22 2008 Nuno Santos <nsantos at redhat.com> - 0.2.656926-4
-- Additional build flags for i686
-
-* Tue May 20 2008 Nuno Santos <nsantos at redhat.com> - 0.2.656926-3
-- BZ 432872: remove examples, which are being packaged separately
-
-* Tue May 20 2008 Justin Ross <jross at redhat.com> -0.2.656926-2
-- Drop build requirements for graphviz and help2man
-
-* Wed May 14 2008 Nuno Santos <nsantos at redhat.com> - 0.2-34
-- Bumped for Beta 4 release
-
-* Fri May 9 2008 Matthew Farrellee <mfarrellee at redhat> - 0.2-33
-- Moved qpidd.conf from qpidc package to qpidd package
-- Added BuildRequires xqilla-devel and xerces-c-devel to qpidd for XML Exchange
-- Added BuildRequires openais-devel to qpidd for CPG
-- Added missing Requires xqilla-devel to qpidd-devel
-
-* Thu May 8 2008 Matthew Farrellee <mfarrellee at redhat> - 0.2-32
-- Added sasl2 config file for qpidd
-- Added cyrus-sasl dependencies
-
-* Wed May 7 2008 Matthew Farrellee <mfarrellee at redhat> - 0.2-31
-- Added python dependency, needed by managementgen
-
-* Wed May 7 2008 Matthew Farrellee <mfarrellee at redhat> - 0.2-30
-- Added management-types.xml to qpidc-devel package
-
-* Tue May 6 2008 Matthew Farrellee <mfarrellee at redhat> - 0.2-29
-- Added managementgen to the qpidc-devel package
-
-* Mon Apr 14 2008 Nuno Santos <nsantos at redhat.com> - 0.2-28
- - Fix home dir permissions
- - Bumped for Fedora 9
-
-* Mon Mar 31 2008 Nuno Santos <nsantos at redhat.com> - 0.2-25
-- Create user qpidd, start qpidd service as qpidd
-
-* Mon Feb 18 2008 Rafael Schloming <rafaels at redhat.com> - 0.2-24
-- Bug fix for TCK issue in Beta 3
-
-* Thu Feb 14 2008 Rafael Schloming <rafaels at redhat.com> - 0.2-23
-- Bumped to pull in fixes for Beta 3
-
-* Tue Feb 12 2008 Alan Conway <aconway at redhat.com> - 0.2-22
-- Added -g to compile flags for debug symbols.
-
-* Tue Feb 12 2008 Alan Conway <aconway at redhat.com> - 0.2-21
-- Create /var/lib/qpidd correctly.
-
-* Mon Feb 11 2008 Rafael Schloming <rafaels at redhat.com> - 0.2-20
-- bumped for Beta 3
-
-* Mon Jan 21 2008 Gordon Sim <gsim at redhat.com> - 0.2-18
-- bump up rev for recent changes to plugin modules & mgmt
-
-* Thu Jan 03 2008 Nuno Santos <nsantos at redhat.com> - 0.2-17
-- add missing header file SessionManager.h
-
-* Thu Jan 03 2008 Nuno Santos <nsantos at redhat.com> - 0.2-16
-- limit builds to i386 and x86_64 archs
-
-* Thu Jan 03 2008 Nuno Santos <nsantos at redhat.com> - 0.2-15
-- add ruby as a build dependency
-
-* Tue Dec 18 2007 Nuno Santos <nsantos at redhat.com> - 0.2-14
-- include fixes from Gordon Sim (fragmentation, lazy-loading, staging)
- and Alan Conway (exception handling in the client).
-
-* Thu Dec 6 2007 Alan Conway <aconway at redhat.com> - 0.2-13
-- installcheck target to build examples in installation.
-
-* Thu Nov 8 2007 Alan Conway <aconway at redhat.com> - 0.2-10
-- added examples to RPM package.
-
-* Thu Oct 9 2007 Alan Conway <aconway at redhat.com> - 0.2-9
-- added config(noreplace) for qpidd.conf
-
-* Thu Oct 4 2007 Alan Conway <aconway at redhat.com> - 0.2-8
-- Added qpidd.conf configuration file.
-- Updated man page to detail configuration options.
-
-* Thu Sep 20 2007 Alan Conway <aconway at redhat.com> - 0.2-7
-- Removed apr dependency.
-
-* Wed Aug 1 2007 Alan Conway <aconway at redhat.com> - 0.2-6
-- added --disable-cluster flag
-
-* Tue Apr 17 2007 Alan Conway <aconway at redhat.com> - 0.2-5
-- Add missing Requires: e2fsprogs-devel for qpidc-devel.
-
-* Tue Apr 17 2007 Alan Conway <aconway at redhat.com> - 0.2-4
-- longer broker_start timeout to avoid failures in plague builds.
-
-* Tue Apr 17 2007 Alan Conway <aconway at redhat.com> - 0.2-3
-- Add missing Requires: apr in qpidc.
-
-* Mon Apr 16 2007 Alan Conway <aconway at redhat.com> - 0.2-2
-- Bugfix for memory errors on x86_64.
-
-* Thu Apr 12 2007 Alan Conway <aconway at redhat.com> - 0.2-1
-- Bumped version number for rhm dependencies.
-
-* Wed Apr 11 2007 Alan Conway <aconway at redhat.com> - 0.1-5
-- Add qpidd-devel sub-package.
-
-* Mon Feb 19 2007 Jim Meyering <meyering at redhat.com> - 0.1-4
-- Address http://bugzilla.redhat.com/220630:
-- Remove redundant "cppunit" build-requires.
-- Add --disable-static.
-
-* Thu Jan 25 2007 Alan Conway <aconway at redhat.com> - 0.1-3
-- Applied Jim Meyerings fixes from http://mail-archives.apache.org/mod_mbox/incubator-qpid-dev/200701.mbox/<87hcugzmyp.fsf@rho.meyering.net>
-
-* Mon Dec 22 2006 Alan Conway <aconway at redhat.com> - 0.1-1
-- Fixed all rpmlint complaints (with help from David Lutterkort)
-- Added qpidd --daemon behaviour, fix init.rc scripts
-
-* Fri Dec 8 2006 David Lutterkort <dlutter at redhat.com> - 0.1-1
-- Initial version based on Jim Meyering's sketch and discussions with Alan
- Conway
diff --git a/sources b/sources
index 78bdefb..e9a1489 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c577b3bdc917c7913e1ec33987dfa77 qpid-0.22.tar.gz
+26fff4ce45352b3949d2263ba9434cb0 qpid-0.24.tar.gz
More information about the scm-commits
mailing list