[Buildroot] [PATCH v3 2/2] package/rabbitmq-server: bump version to 3.8.2

Frank Vanbever frank.vanbever at essensium.com
Thu Feb 13 15:14:14 UTC 2020


RabbitMQ now depends on Elixir for the build system.
The log directory is required for the server to start with the default
configuration. This behaviour was changed in v3.7 with the move to erlang-lager
as the logging library.

License changes:
- LICENSE: Added clarification about the licensing of a number of included
  dependencies and a URL changed to HTTPS. License remains MPL-1.1
- LICENSE-BSD-base64js: URL changed to https (license text is actually MIT)
- LICENSE-MIT-Flot: year update
- LICENSE-MIT-JQuery164: URL changed to https
- LICENSE-MPL-RabbitMQ: URL changed to https, year update
- LICENSE-MPL2: URL changed to https

Removed licenses:
- LICENSE-APL2-Rebar: Removed dependency
- LICENSE-BSD-gl-Matrix: Removed dependency
- LICENSE-ERL-OTP: Removed license
- LICENSE-MIT-Mochiweb: Removed dependency
- LICENSE-MIT-SockJS: Removed dependency

New licenses:
- LICENSE-APACHE2-excanvas: new bundled dependency (Apache 2)
- LICENSE-BSD-recon: new bundled dependency (BSD 3-clause)
- LICENSE-erlcloud: new bundled dependency (BSD 2-clause)
- LICENSE-httpc_aws: new bundled dependency (BSD 3-clause)
- LICENSE-ISC-cowboy: new bundled dependency (ISC)
- LICENSE-MIT-EJS: new bundled dependency (MIT)
- LICENSE-MIT-Erlware-commons: license was present in 3.6.6 but not included in
  the list
- LICENSE-MIT-jQuery: new bundled dependency (MIT)
- LICENSE-MIT-Sammy: new bundled dependency (MIT)
- LICENSE-rabbitmq_aws: new bundled dependency (BSD 3-clause)

Signed-off-by: Frank Vanbever <frank.vanbever at essensium.com>
---
Changes v2 -> v3:
 - Cleaned up license files
Changes v1 -> v2:
 - Remove reference to BR2_PACKAGE_HOST_ELIXIR

Signed-off-by: Frank Vanbever <frank.vanbever at essensium.com>
---
 package/rabbitmq-server/S50rabbitmq-server    |  2 ++
 package/rabbitmq-server/rabbitmq-server.hash  | 31 ++++++++++++-------
 package/rabbitmq-server/rabbitmq-server.mk    | 29 ++++++++++-------
 .../rabbitmq-server/rabbitmq-server.service   |  1 +
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/package/rabbitmq-server/S50rabbitmq-server b/package/rabbitmq-server/S50rabbitmq-server
index faf248ded2..35f7844860 100644
--- a/package/rabbitmq-server/S50rabbitmq-server
+++ b/package/rabbitmq-server/S50rabbitmq-server
@@ -5,10 +5,12 @@
 
 INSTALLUSER=rabbitmq
 RUNDIR=/var/run/rabbitmq
+LOGDIR=/var/log/rabbitmq
 
 case "$1" in
   start)
 	install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1
+	install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$LOGDIR" || exit 1
         printf "Starting rabbitmq-server: "
         su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null
         [ $? = 0 ] && echo "OK" || echo "FAIL"
diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash
index 5ad55b167b..693ab208ec 100644
--- a/package/rabbitmq-server/rabbitmq-server.hash
+++ b/package/rabbitmq-server/rabbitmq-server.hash
@@ -1,18 +1,25 @@
 # Locally computed
-sha256  395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e  rabbitmq-server-3.6.6.tar.xz
-sha256  2d6485b111c3ef40900d5accb40388fbf99d4b018274b3617e1c92b86d95c985  LICENSE
+sha256  8c6729b985cb21bab13363b1c806cfa15845b046be9e641ab1496bd5a1eaf19d  rabbitmq-server-3.8.2.tar.xz
+sha256  a96b7ed2e7def9c86d84d9ca0e79e4a55fc8e6e202ac89caa4f9791ccb9cf2a3  LICENSE
+sha256  acd82bfce369b066e7e612197206da4fa38b8614486658775d0b6f66ac30114a  LICENSE-APACHE2
+sha256  aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe  LICENSE-APACHE2-excanvas
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE-APACHE2-ExplorerCanvas
-sha256  809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0  LICENSE-APL2-Rebar
 sha256  b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841  LICENSE-APL2-Stomp-Websocket
-sha256  cdc8c5132e24712732282867575b23b951f277fe9641d72e730a264e8d8add2f  LICENSE-BSD-base64js
-sha256  2c7784c174b3eff8507a8cb815c721800882f6d53860c2f2ecf34c8ce2d510f1  LICENSE-BSD-glMatrix
-sha256  a97b529abfed8dea9f644e1d3294a14beba6aaf3a8e2f0db6a347e01ceb623cd  LICENSE-EPL-OTP
+sha256  3c69f8327beaaa45d2f3d7831edf211d0f37d1d9c7754267478320697e1882e9  LICENSE-BSD-base64js
+sha256  af7b5cdf5e16446c64d6e755b2a6386e38c56500ae27587edcd94c96d330ee35  LICENSE-BSD-recon
+sha256  7615ea96ccddc822655cb48a9d2a5cac2f176fca7fe28131af934ce21f48cbc8  LICENSE-erlcloud
+sha256  c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234  LICENSE-httpc_aws
+sha256  c0e940d13f488849c27963e7d87f3fc27a2f5843cfd49148029a558251014689  LICENSE-ISC-cowboy
+sha256  af399cded8f343407fb68eeb51755676e9700c65c380f073376afd8d20f428a1  LICENSE-MIT-EJS
 sha256  b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1  LICENSE-MIT-EJS10
-sha256  e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c  LICENSE-MIT-Flot
-sha256  f10e24a690fa6f8a2154dd0b8623e0431c6c049482f139d0980664de612a7d5b  LICENSE-MIT-jQuery164
+sha256  0f26e121a7a1dab675bd8474cdc517428863036a668260033467c7278f488cd4  LICENSE-MIT-Erlware-Commons
+sha256  52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c  LICENSE-MIT-Flot
+sha256  8cb9a8ff8cafd6a085fd4f086e797b719c334a621df19354dc286591003da3f5  LICENSE-MIT-jQuery
+sha256  44f25d51c90aa55dd4b3ba7f3d6e9a594073fcbefe651e16e74cabd48005b476  LICENSE-MIT-jQuery164
 sha256  fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692  LICENSE-MIT-Mochi
-sha256  363a3b367503176fad7fd794168193ff9add85c3d28b73af804b67ff11c59115  LICENSE-MIT-Mochiweb
+sha256  b80081a5bb527dbe6b79f18a40f44b4ba6303e4856cadd249672c97b90e6dd7c  LICENSE-MIT-Sammy
 sha256  cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed  LICENSE-MIT-Sammy060
-sha256  c29e506dd734930964382e52e98f60ab7a46c2be639165a3a25083272c8fc29f  LICENSE-MIT-SockJS
-sha256  f3a296f863a2729506bf0e9f1b3f219e63ede4906a88790fdd4d696f825b70ba  LICENSE-MPL-RabbitMQ
-sha256  fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85  LICENSE-MPL2
+sha256  c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd  LICENSE-MPL
+sha256  c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd  LICENSE-MPL-RabbitMQ
+sha256  66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172  LICENSE-MPL2
+sha256  c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234  LICENSE-rabbitmq_aws
diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk
index 99b1ed4100..26c2fae5ec 100644
--- a/package/rabbitmq-server/rabbitmq-server.mk
+++ b/package/rabbitmq-server/rabbitmq-server.mk
@@ -4,29 +4,36 @@
 #
 ################################################################################
 
-RABBITMQ_SERVER_VERSION = 3.6.6
-RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION)
+RABBITMQ_SERVER_VERSION = 3.8.2
+RABBITMQ_SERVER_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(RABBITMQ_SERVER_VERSION)
 RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz
-RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPL-2.0
-RABBITMQ_SERVER_LICENSE_FILES =
+RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-3-Clause, BSD-2-Clause, MIT, MPL-2.0, ISC
+RABBITMQ_SERVER_LICENSE_FILES = \
 	LICENSE \
+	LICENSE-APACHE2 \
+	LICENSE-APACHE2-excanvas \
 	LICENSE-APACHE2-ExplorerCanvas \
-	LICENSE-APL2-Rebar \
 	LICENSE-APL2-Stomp-Websocket \
 	LICENSE-BSD-base64js \
-	LICENSE-BSD-glMatrix \
-	LICENSE-EPL-OTP
+	LICENSE-BSD-recon \
+	LICENSE-erlcloud \
+	LICENSE-httpc_aws \
+	LICENSE-ISC-cowboy \
+	LICENSE-MIT-EJS \
 	LICENSE-MIT-EJS10 \
+	LICENSE-MIT-Erlware-Commons \
 	LICENSE-MIT-Flot \
+	LICENSE-MIT-jQuery \
 	LICENSE-MIT-jQuery164 \
 	LICENSE-MIT-Mochi \
-	LICENSE-MIT-Mochiweb \
+	LICENSE-MIT-Sammy \
 	LICENSE-MIT-Sammy060 \
-	LICENSE-MIT-SockJS \
+	LICENSE-MPL \
 	LICENSE-MPL-RabbitMQ \
-	LICENSE-MPL2
+	LICENSE-MPL2 \
+	LICENSE-rabbitmq_aws
 
-RABBITMQ_SERVER_DEPENDENCIES = host-libxslt host-zip erlang libxslt
+RABBITMQ_SERVER_DEPENDENCIES = host-elixir host-libxslt host-zip erlang libxslt
 RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults
 
 define RABBITMQ_SERVER_BUILD_CMDS
diff --git a/package/rabbitmq-server/rabbitmq-server.service b/package/rabbitmq-server/rabbitmq-server.service
index 268b4bdcd2..f69b33d455 100644
--- a/package/rabbitmq-server/rabbitmq-server.service
+++ b/package/rabbitmq-server/rabbitmq-server.service
@@ -8,6 +8,7 @@ User=rabbitmq
 Group=rabbitmq
 Environment=HOME=/var/lib/rabbitmq
 WorkingDirectory=/var/lib/rabbitmq
+LogsDirectory=/var/log/rabbitmq
 ExecStart=/usr/sbin/rabbitmq-server
 ExecStop=/usr/sbin/rabbitmqctl stop
 
-- 
2.20.1



More information about the buildroot mailing list