From 944e734876030fa10b2c0afcd36877d16c6c359b Mon Sep 17 00:00:00 2001
From: John Eckersberg <jeckersb@redhat.com>
Date: Oct 22 2014 13:33:55 +0000
Subject: New upstream release - 3.4.0


---

diff --git a/.gitignore b/.gitignore
index 6d29ed7..3beb6d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ rabbitmq-server-1.8.0.tar.gz
 /rabbitmq-server-3.1.3.tar.gz
 /rabbitmq-server-3.1.5.tar.gz
 /rabbitmq-server-3.3.5.tar.gz
+/rabbitmq-server-3.4.0.tar.gz
diff --git a/rabbitmq-probe-ephemeral-port.patch b/rabbitmq-probe-ephemeral-port.patch
index 65ca2ac..0561360 100644
--- a/rabbitmq-probe-ephemeral-port.patch
+++ b/rabbitmq-probe-ephemeral-port.patch
@@ -1,12 +1,11 @@
-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
+--- rabbitmq-server-3.4.0/src/rabbit_networking.erl.orig	2014-10-22 09:19:54.863016691 -0400
++++ rabbitmq-server-3.4.0/src/rabbit_networking.erl	2014-10-22 09:20:52.006197328 -0400
 @@ -39,7 +39,7 @@
- 
- -define(SSL_TIMEOUT, 5). %% seconds
+ -include("rabbit.hrl").
+ -include_lib("kernel/include/inet.hrl").
  
 --define(FIRST_TEST_BIND_PORT, 10000).
 +-define(FIRST_TEST_BIND_PORT, 32768).
  
- %%----------------------------------------------------------------------------
- 
+ %% POODLE
+ -define(BAD_SSL_PROTOCOL_VERSIONS, [sslv3]).
diff --git a/rabbitmq-server-systemd-notify-support.patch b/rabbitmq-server-systemd-notify-support.patch
index 2d50de1..733635f 100644
--- a/rabbitmq-server-systemd-notify-support.patch
+++ b/rabbitmq-server-systemd-notify-support.patch
@@ -1,21 +1,11 @@
-diff -Naur rabbitmq-server-3.3.5.orig/src/rabbit.erl rabbitmq-server-3.3.5/src/rabbit.erl
---- rabbitmq-server-3.3.5.orig/src/rabbit.erl	2014-08-27 09:33:37.404506484 -0400
-+++ rabbitmq-server-3.3.5/src/rabbit.erl	2014-08-27 09:34:51.800243321 -0400
-@@ -314,6 +314,8 @@
-                      rabbit_mnesia:check_cluster_consistency(),
-                      ok = app_utils:start_applications(
-                             app_startup_order(), fun handle_app_error/2),
-+                     {module, sd_notify} == code:load_file(sd_notify) andalso
-+                         sd_notify:sd_notify(0, "READY=1"),
-                      ok = log_broker_started(rabbit_plugins:active())
-              end).
- 
-@@ -336,6 +338,8 @@
-                                                                   false),
-                      ok = app_utils:start_applications(
-                             StartupApps, fun handle_app_error/2),
-+                     {module, sd_notify} == code:load_file(sd_notify) andalso
-+                         sd_notify:sd_notify(0, "READY=1"),
-                      ok = log_broker_started(Plugins)
-              end).
+--- rabbitmq-server-3.4.0/src/rabbit.erl.orig	2014-10-22 09:23:41.578344937 -0400
++++ rabbitmq-server-3.4.0/src/rabbit.erl	2014-10-22 09:26:41.543213183 -0400
+@@ -323,6 +323,8 @@
+     Plugins = rabbit_plugins:setup(),
+     ToBeLoaded = Plugins ++ ?APPS,
+     start_apps(ToBeLoaded),
++    {module, sd_notify} == code:load_file(sd_notify) andalso
++        sd_notify:sd_notify(0, "READY=1"),
+     ok = log_broker_started(rabbit_plugins:active()).
  
+ start_it(StartFun) ->
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index e8ea924..7c5c8b7 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -2,8 +2,8 @@
 
 
 Name: rabbitmq-server
-Version: 3.3.5
-Release: 2%{?dist}
+Version: 3.4.0
+Release: 1%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
 Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
@@ -207,6 +207,9 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Wed Oct 22 2014 John Eckersberg <eck@redhat.com> - 3.4.0-1
+- New upstream release - 3.4.0
+
 * Tue Sep 30 2014 John Eckersberg <eck@redhat.com> - 3.3.5-2
 - Add rabbitmq-plugins to default path (#1033305)
 
diff --git a/sources b/sources
index 63756e4..f9760af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3bf0c4be1aaa6fdb483470aba14a6c81  rabbitmq-server-3.3.5.tar.gz
+eb095bf222a3a2361b92e36894795b42  rabbitmq-server-3.4.0.tar.gz