Merge bug23354 (remove xmlto and half of universe as macports deps)

2 files changed, 24 insertions, 13 deletions

diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index af6e257ade..a1987fb292 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -29,8 +29,8 @@
 %%   Contributor(s): ______________________________________.
 %%
 
--record(user, {username, password, is_admin}).
--record(permission, {scope, configure, write, read}).
+-record(user, {username, password_hash, is_admin}).
+-record(permission, {configure, write, read}).
 -record(user_vhost, {username, virtual_host}).
 -record(user_permission, {user_vhost, permission}).
 
@@ -63,7 +63,7 @@
 -record(binding, {source, key, destination, args = []}).
 -record(reverse_binding, {destination, key, source, args = []}).
 
--record(listener, {node, protocol, host, port}).
+-record(listener, {node, protocol, host, ip_address, port}).
 
 -record(basic_message, {exchange_name, routing_key, content, guid,
                         is_persistent}).
@@ -74,6 +74,8 @@
 
 -record(event, {type, props, timestamp}).
 
+-record(message_properties, {expiry}).
+
 %%----------------------------------------------------------------------------
 
 -define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.").
diff --git a/include/rabbit_backing_queue_spec.hrl b/include/rabbit_backing_queue_spec.hrl
index 38c6f9398f..20230b2447 100644
--- a/include/rabbit_backing_queue_spec.hrl
+++ b/include/rabbit_backing_queue_spec.hrl
@@ -31,12 +31,15 @@
 
 -type(fetch_result() ::
         ('empty' |
-         %% Message,  IsDelivered,  AckTag,  RemainingLen
+         %% Message,                  IsDelivered, AckTag, Remaining_Len
          {rabbit_types:basic_message(), boolean(), ack(), non_neg_integer()})).
 -type(is_durable() :: boolean()).
 -type(attempt_recovery() :: boolean()).
 -type(purged_msg_count() :: non_neg_integer()).
 -type(ack_required() :: boolean()).
+-type(message_properties_transformer() ::
+        fun ((rabbit_types:message_properties())
+             -> rabbit_types:message_properties())).
 
 -spec(start/1 :: ([rabbit_amqqueue:name()]) -> 'ok').
 -spec(stop/0 :: () -> 'ok').
@@ -45,19 +48,25 @@
 -spec(terminate/1 :: (state()) -> state()).
 -spec(delete_and_terminate/1 :: (state()) -> state()).
 -spec(purge/1 :: (state()) -> {purged_msg_count(), state()}).
--spec(publish/2 :: (rabbit_types:basic_message(), state()) -> state()).
--spec(publish_delivered/3 ::
-        (ack_required(), rabbit_types:basic_message(), state()) ->
-                                  {ack(), state()}).
+-spec(publish/3 :: (rabbit_types:basic_message(),
+                    rabbit_types:message_properties(), state()) -> state()).
+-spec(publish_delivered/4 :: (ack_required(), rabbit_types:basic_message(),
+                              rabbit_types:message_properties(), state())
+                             -> {ack(), state()}).
+-spec(dropwhile/2 ::
+        (fun ((rabbit_types:message_properties()) -> boolean()), state())
+        -> state()).
 -spec(fetch/2 :: (ack_required(), state()) -> {fetch_result(), state()}).
 -spec(ack/2 :: ([ack()], state()) -> state()).
--spec(tx_publish/3 :: (rabbit_types:txn(), rabbit_types:basic_message(),
-                       state()) -> state()).
+-spec(tx_publish/4 :: (rabbit_types:txn(), rabbit_types:basic_message(),
+                       rabbit_types:message_properties(), state()) -> state()).
 -spec(tx_ack/3 :: (rabbit_types:txn(), [ack()], state()) -> state()).
 -spec(tx_rollback/2 :: (rabbit_types:txn(), state()) -> {[ack()], state()}).
--spec(tx_commit/3 :: (rabbit_types:txn(), fun (() -> any()), state()) ->
-                          {[ack()], state()}).
--spec(requeue/2 :: ([ack()], state()) -> state()).
+-spec(tx_commit/4 ::
+        (rabbit_types:txn(), fun (() -> any()),
+         message_properties_transformer(), state()) -> {[ack()], state()}).
+-spec(requeue/3 :: ([ack()], message_properties_transformer(), state())
+                   -> state()).
 -spec(len/1 :: (state()) -> non_neg_integer()).
 -spec(is_empty/1 :: (state()) -> boolean()).
 -spec(set_ram_duration_target/2 ::