From fb7e0323a540cfcddb9a263eec131bb037206090 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mar 29 2019 12:50:04 +0000 Subject: RabbitMQ ver. 3.7.14 Signed-off-by: Peter Lemenkov --- diff --git a/rabbitmq-aws-0001-Rename-some-types-to-make-it-build-on-21.3.patch b/rabbitmq-aws-0001-Rename-some-types-to-make-it-build-on-21.3.patch deleted file mode 100644 index 23c18c1..0000000 --- a/rabbitmq-aws-0001-Rename-some-types-to-make-it-build-on-21.3.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Daniil Fedotov -Date: Mon, 18 Mar 2019 18:29:08 -0400 -Subject: [PATCH] Rename some types to make it build on 21.3. - -ssl_api.hrl does not contain types starting from 21.3. -Use non-existent types instead. This will dyalize, but there is no type -I know of, to fit both old and new types. - -diff --git a/include/rabbitmq_aws.hrl b/include/rabbitmq_aws.hrl -index f6fffd8..a3e906e 100644 ---- a/include/rabbitmq_aws.hrl -+++ b/include/rabbitmq_aws.hrl -@@ -8,8 +8,6 @@ - %% @end - %% ==================================================================== - ---include_lib("ssl/src/ssl_api.hrl"). -- - -define(MIME_AWS_JSON, "application/x-amz-json-1.0"). - -define(SCHEME, https). - -@@ -27,7 +25,7 @@ - -type expiration() :: calendar:datetime() | undefined. - -type security_token() :: nonempty_string() | undefined. - -type region() :: nonempty_string() | undefined. -- -+-type path() :: ssl:path(). - - -type sc_ok() :: {ok, access_key(), secret_access_key(), expiration(), security_token()}. - -type sc_error() :: {error, Reason :: atom()}. -@@ -72,7 +70,7 @@ - -type headers() :: [header()]. - -type body() :: string() | binary(). - ---type ssl_options() :: [ssl_option()]. -+-type ssl_options() :: [ssl:ssl_option()]. - - -type http_option() :: {timeout, timeout()} | - {connect_timeout, timeout()} | diff --git a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch index 14c2f7a..e8e2112 100644 --- a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch +++ b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch @@ -11,7 +11,7 @@ first one. Signed-off-by: Peter Lemenkov diff --git a/src/rabbit_nodes_common.erl b/src/rabbit_nodes_common.erl -index e773bf6..1cbe1a4 100644 +index 706df55..e1932cc 100644 --- a/src/rabbit_nodes_common.erl +++ b/src/rabbit_nodes_common.erl @@ -80,9 +80,14 @@ do_ensure_epmd(false, Prog) -> diff --git a/rabbitmq-common-0002-force-python3.patch b/rabbitmq-common-0002-force-python3.patch index bceecdf..f081021 100644 --- a/rabbitmq-common-0002-force-python3.patch +++ b/rabbitmq-common-0002-force-python3.patch @@ -5,7 +5,7 @@ Subject: [PATCH] force python3 Signed-off-by: Lon Hohberger diff --git a/codegen.py b/codegen.py -index a0300ed..b0484ee 100755 +index 8b81362..4c0d714 100755 --- a/codegen.py +++ b/codegen.py @@ -1,4 +1,4 @@ diff --git a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch index d5ef696..eab670c 100644 --- a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch +++ b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove excessive sd_notify code Signed-off-by: Peter Lemenkov diff --git a/src/rabbit.erl b/src/rabbit.erl -index 7720c05fa..d76e3e475 100644 +index 722da4c85..efbf57319 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -345,123 +345,9 @@ broker_start() -> +@@ -354,123 +354,9 @@ broker_start() -> Plugins = rabbit_plugins:setup(), ToBeLoaded = Plugins ++ ?APPS, start_apps(ToBeLoaded), diff --git a/rabbitmq-server-0002-Add-systemd-notification-support.patch b/rabbitmq-server-0002-Add-systemd-notification-support.patch index 5af18ee..8cf842b 100644 --- a/rabbitmq-server-0002-Add-systemd-notification-support.patch +++ b/rabbitmq-server-0002-Add-systemd-notification-support.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Add systemd notification support diff --git a/src/rabbit.erl b/src/rabbit.erl -index d76e3e475..7b1169adb 100644 +index efbf57319..c6821d80e 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl -@@ -345,6 +345,11 @@ broker_start() -> +@@ -354,6 +354,11 @@ broker_start() -> Plugins = rabbit_plugins:setup(), ToBeLoaded = Plugins ++ ?APPS, start_apps(ToBeLoaded), diff --git a/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch b/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch index c580638..19a9add 100644 --- a/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch +++ b/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch @@ -5,7 +5,7 @@ Subject: [PATCH] rabbit_prelaunch must use RABBITMQ_SERVER_ERL_ARGS Signed-off-by: Peter Lemenkov diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server -index e55d4b5c9..a95e9b7e9 100755 +index 69474d697..6b4a94d0f 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -193,6 +193,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index b3b9028..f684010 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -4,8 +4,8 @@ Name: rabbitmq-server -Version: 3.7.13 -Release: 2%{?dist} +Version: 3.7.14 +Release: 1%{?dist} License: MPLv1.1 Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz Source1: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz.asc @@ -21,7 +21,6 @@ Patch101: rabbitmq-common-0001-Use-proto_dist-from-command-line.patch Patch102: rabbitmq-common-0002-force-python3.patch Patch201: rabbitmq-server-release-0001-Don-t-use-templates.patch Patch301: rabbitmq-amqp1.0-common-0001-force-python3.patch -Patch401: rabbitmq-aws-0001-Rename-some-types-to-make-it-build-on-21.3.patch URL: https://www.rabbitmq.com/ BuildArch: noarch @@ -80,10 +79,6 @@ cd deps/amqp10_common %patch301 -p1 cd ../.. -cd deps/rabbitmq_aws -%patch401 -p1 -cd ../.. - # We have to remove it until common_test subpackage lands RHOS rm -f \ deps/amqp_client/src/rabbit_ct_client_helpers.erl \ @@ -200,6 +195,9 @@ done %changelog +* Fri Mar 29 2019 Peter Lemenkov - 3.7.14-1 +- Ver. 3.7.14 + * Thu Mar 21 2019 Peter Lemenkov - 3.7.13-2 - Force Python3 diff --git a/rabbitmq-server_3.7.14.orig.tar.xz.asc b/rabbitmq-server_3.7.14.orig.tar.xz.asc new file mode 100644 index 0000000..d1f8aa8 --- /dev/null +++ b/rabbitmq-server_3.7.14.orig.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJcnUHAAAoJEGtzo25gJt/KDc0P/jG4ZIyxmi/8G64adFspiSNS +tNlfZREH5xEhOWURBVY/+MDPYY0kG8SzgFo2mDQVariryiZkayHWtC6oy4FACH2n +mIJ7eCPAw0Y+m8x+2ndHIuy8TiSP8Ue156KcaSTjl+VxYtUZLHx5Z2Hs5MqNqdjv +VhN735Q78pHUgKfTbWGX5obPa4SCLqZUSG+Yc17hEo6fEJGgJuHHOAtHPBeL363W +dLKWRR5lHQVwr9ot3ngS3RreIIv2GX+zMijyanA8/v5y0TzAj76J9i73v6FOpHtK +1dkCi5gwE8wlpRIIJrMDVjpD7LsyrPXby7gPGrpOjnjHAegPVaHZOe4IRxqAUMr9 +zE52vC+NHUuEaoyho/O2WAVd7RNOGj3o2MlFOrXhODUQHeszOu0DY0A/VZHX1Grx +18W72nbk/CjAUsA1Lm6EGgYhagt5PE1hngFxrZN3tIJw2Y9urEwCttcBQmzfdBvC +LzhnBzOy30nbctUPGG8zxliYiSbUBbUUmO2+7PxMBkoLjPZ5l2cqOAl+tKvx2q1w +2LENcwfoNsJwEWJhLRB1d5Zk7UlKTdShR14Ar1P0G2mCkznJq3zv6zRhaBCte0xW +/MVhQUER+xuLft1ym6xkLQ+558jHSu/HUDL1BLSmkQGu+ywiHg3JXxqgD5qBXJbn +ZGbebTm9FdPfQXWHnqop +=g5Mj +-----END PGP SIGNATURE----- diff --git a/sources b/sources index 276463a..60a58ea 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (rabbitmq-server_3.7.13.orig.tar.xz) = 33cc3682214782152e4e1270d1011e94df79b454abf6fcf9d56b73be1f8cf42ce0a4a559f243b4721ae25b10897c756960c655909bee2b427395d0f0b63a2fb9 -SHA512 (rabbitmq-server_3.7.13.orig.tar.xz.asc) = 6142981f5955ccc5c5e602d30cbee1e6b3101837a06219b351a0f3252e79a41c19549747a4addef7c783bca3cb71ee7c2bef7c4b9648ff57b30a09979ec7ec2f +SHA512 (rabbitmq-server_3.7.14.orig.tar.xz) = 38c38e64a736c0c27dbefe2249a8c9a42a04dc8c05090d3c15ffa2a651685c646b800a627eb5a1997f76335fd07c41d5dd132dac3be5e027ceb6fac989104038