summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Eckersberg <jeckersb@redhat.com>2014-01-24 10:47:03 -0500
committerRichard W.M. Jones <rjones@redhat.com>2014-03-31 16:53:19 +0100
commit14ee5391e028ee764420f46af8c01a63b41cd341 (patch)
tree5d079c4e0dd9e3622a77a9d49928f7acbc15a70b
parentaaf4775f63b04a59c2723631b19b79a333e89c1c (diff)
downloadrabbitmq-server-14ee5391e028ee764420f46af8c01a63b41cd341.tar.gz
rabbitmq-server-14ee5391e028ee764420f46af8c01a63b41cd341.tar.xz
rabbitmq-server-14ee5391e028ee764420f46af8c01a63b41cd341.zip
Use ephemeral port for probing
-rw-r--r--rabbitmq-probe-ephemeral-port.patch12
-rw-r--r--rabbitmq-server.spec5
2 files changed, 17 insertions, 0 deletions
diff --git a/rabbitmq-probe-ephemeral-port.patch b/rabbitmq-probe-ephemeral-port.patch
new file mode 100644
index 0000000..65ca2ac
--- /dev/null
+++ b/rabbitmq-probe-ephemeral-port.patch
@@ -0,0 +1,12 @@
+diff -Naur rabbitmq-server-3.1.5.orig/src/rabbit_networking.erl rabbitmq-server-3.1.5/src/rabbit_networking.erl
+--- rabbitmq-server-3.1.5.orig/src/rabbit_networking.erl 2014-01-24 10:24:25.488664673 -0500
++++ rabbitmq-server-3.1.5/src/rabbit_networking.erl 2014-01-24 10:24:58.475664551 -0500
+@@ -39,7 +39,7 @@
+
+ -define(SSL_TIMEOUT, 5). %% seconds
+
+--define(FIRST_TEST_BIND_PORT, 10000).
++-define(FIRST_TEST_BIND_PORT, 32768).
+
+ %%----------------------------------------------------------------------------
+
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 3ca9060..df1e6da 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -35,6 +35,10 @@ Requires(preun):chkconfig
Requires(preun):initscripts
%endif
+# https://bugzilla.redhat.com/show_bug.cgi?id=998682
+# https://bugzilla.redhat.com/show_bug.cgi?id=1032595#c8
+Patch0: rabbitmq-probe-ephemeral-port.patch
+
%description
RabbitMQ is an implementation of AMQP, the emerging standard for high
performance enterprise messaging. The RabbitMQ server is a robust and
@@ -52,6 +56,7 @@ scalable implementation of an AMQP broker.
%prep
%setup -q
+%patch0 -p1
%build
cp %{S:2} %{_rabbit_wrapper}