testing/rabbitmq-server: upgrade to 3.11.3

2 files changed, 17 insertions, 90 deletions

diff --git a/testing/rabbitmq-server/APKBUILD b/testing/rabbitmq-server/APKBUILD
index 9227e21445..f1e336bbe4 100644
--- a/testing/rabbitmq-server/APKBUILD
+++ b/testing/rabbitmq-server/APKBUILD
@@ -1,25 +1,35 @@
 # Contributor: Nathan Johnson <nathan@nathanjohnson.info>
 # Maintainer: Nathan Johnson <nathan@nathanjohnson.info>
 pkgname=rabbitmq-server
-pkgver=3.10.6
+pkgver=3.11.3
 pkgrel=0
 pkgdesc="open source multi-protocol messaging broker"
 url="https://www.rabbitmq.com/"
 arch="noarch"
 license="MPL-1.1"
 depends="erlang"
-makedepends="$depends_dev erlang-dev python3 py3-simplejson xmlto libxslt
-	rsync zip gawk grep socat elixir"
+makedepends="
+	elixir
+	erlang-dev
+	gawk
+	grep
+	libxslt
+	py3-simplejson
+	python3
+	rsync
+	socat
+	xmlto
+	zip
+	"
 install="$pkgname.pre-install $pkgname.post-deinstall"
 pkgusers="rabbitmq"
 pkggroups="rabbitmq"
 subpackages="$pkgname-doc"
 source="
+	https://github.com/rabbitmq/rabbitmq-server/releases/download/v$pkgver/rabbitmq-server-$pkgver.tar.xz
 	rabbitmq-server.initd
 	rabbitmq-server.logrotate
-	https://github.com/rabbitmq/rabbitmq-server/releases/download/v$pkgver/rabbitmq-server-$pkgver.tar.xz
-	py3.patch
-"
+	"
 options="!check" # test suite broken
 
 # secfixes:
@@ -87,8 +97,7 @@ package() {
 }
 
 sha512sums="
+6f010a9b7286ce3960435f201c771cc317c9b97f733649eae43ca4db2f839904aad08e7285bccf889a295cfcdc9b34b169d00f90118c75c11850c375ac2bb8a9  rabbitmq-server-3.11.3.tar.xz
 a8bb02a7cae1f8720e5c7aaabfe6a2c0e731cffbe0d8f99bdcb6597daa654dc49e6d41943974601435700cf469eaa8286dc91a3255a6b9023754c3861fbb5cd9  rabbitmq-server.initd
 b8655cb048ab3b32001d4e6920bb5366696f3a5da75c053605e9b270e771c548e36858dca8338813d34376534515bba00af5e6dd7b4b1754a0e64a8fb756e3f3  rabbitmq-server.logrotate
-e43cebc07c3e58b9900e30425ea6a6c31d6f2b0ad38a920ccd249df599983126445fd2eb7084d6b38d014701e69475fa6261baa29b39579a063cded0336e109c  rabbitmq-server-3.10.6.tar.xz
-a2e70b1f857892ae1665eed097a8f8b758985d067393c674c43d85aa7650b1f94ddd720053954304c1220896a7812c60c1ca5f41a3357c067fb758094161b82c  py3.patch
 "
diff --git a/testing/rabbitmq-server/py3.patch b/testing/rabbitmq-server/py3.patch
deleted file mode 100644
index 259ab507f4..0000000000
--- a/testing/rabbitmq-server/py3.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/deps/rabbit_common/codegen.py b/deps/rabbit_common/codegen.py
-index 8b81362..70bd7fa 100755
---- a/deps/rabbit_common/codegen.py
-+++ b/deps/rabbit_common/codegen.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- ##  This Source Code Form is subject to the terms of the Mozilla Public
- ##  License, v. 2.0. If a copy of the MPL was not distributed with this
-diff --git a/deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_django/manage.py b/deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_django/manage.py
-index 1ae2e80..3e61442 100755
---- a/deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_django/manage.py
-+++ b/deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_django/manage.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- import os
- import sys
- 
-diff --git a/deps/rabbitmq_consistent_hash_exchange/README.md b/deps/rabbitmq_consistent_hash_exchange/README.md
-index ce1623f..6ff906b 100644
---- a/deps/rabbitmq_consistent_hash_exchange/README.md
-+++ b/deps/rabbitmq_consistent_hash_exchange/README.md
-@@ -150,7 +150,7 @@ Executable versions of some of the code examples can be found under [./examples]
- This version of the example uses [Pika](https://pika.readthedocs.io/en/stable/), the most widely used Python client for RabbitMQ:
- 
- ``` python
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import pika
- import time
-@@ -342,7 +342,7 @@ routed to the same **arbitrarily chosen** queue.
- #### Code Example in Python
- 
- ``` python
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import pika
- import time
-@@ -544,7 +544,7 @@ routed to the same **arbitrarily chosen** queue.
- #### Code Example in Python
- 
- ``` python
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import pika
- import time
-diff --git a/deps/rabbitmq_consistent_hash_exchange/examples/python/example1.py b/deps/rabbitmq_consistent_hash_exchange/examples/python/example1.py
-index 6cf67d6..30e43ea 100644
---- a/deps/rabbitmq_consistent_hash_exchange/examples/python/example1.py
-+++ b/deps/rabbitmq_consistent_hash_exchange/examples/python/example1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import pika
- import time
-diff --git a/deps/rabbitmq_consistent_hash_exchange/examples/python/example2.py b/deps/rabbitmq_consistent_hash_exchange/examples/python/example2.py
-index 8c1ac15..0099b28 100644
---- a/deps/rabbitmq_consistent_hash_exchange/examples/python/example2.py
-+++ b/deps/rabbitmq_consistent_hash_exchange/examples/python/example2.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import pika
- import time
-diff --git a/deps/rabbitmq_consistent_hash_exchange/examples/python/example3.py b/deps/rabbitmq_consistent_hash_exchange/examples/python/example3.py
-index 0b74501..c11a4ce 100644
---- a/deps/rabbitmq_consistent_hash_exchange/examples/python/example3.py
-+++ b/deps/rabbitmq_consistent_hash_exchange/examples/python/example3.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import pika
- import time
-