2 files changed, 21 insertions, 7 deletions
diff --git a/system/rabbitmq-server/rabbitmq-server.SlackBuild b/system/rabbitmq-server/rabbitmq-server.SlackBuild
index a9e5d2ca59959..968ae5ff9b1cb 100644
--- a/system/rabbitmq-server/rabbitmq-server.SlackBuild
+++ b/system/rabbitmq-server/rabbitmq-server.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rabbitmq-server
-VERSION=${VERSION:-3.6.0}
+VERSION=${VERSION:-3.6.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -34,7 +34,7 @@ RABBITMQ_GID=${RABBITMQ_GID:-319}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -87,6 +87,7 @@ find -L . \
 make
 make docs
 make install install-man\
+  VERSION=${VERSION} \
   PREFIX=/usr \
   DESTDIR=$PKG \
   MANDIR=/usr/man \
@@ -94,6 +95,7 @@ make install install-man\
 
 mkdir -p ${PKG}/usr/bin
 (
+  install -m 755 deps/rabbitmq_management/bin/rabbitmqadmin $PKG/usr/bin/rabbitmqadmin
   cd ${PKG}/usr/bin
   ln -s ../lib${LIBDIRSUFFIX}/erlang/lib/rabbitmq_server-${VERSION}/sbin/rabbitmq-defaults
   ln -s ../lib${LIBDIRSUFFIX}/erlang/lib/rabbitmq_server-${VERSION}/sbin/rabbitmq-env
@@ -108,14 +110,26 @@ chown -R $RABBITMQ_USER:$RABBITMQ_GROUP $PKG/var/{lib,log}/rabbitmq
 
 install -dm 750 ${PKG}/etc/rabbitmq
 install -m 644 $CWD/rabbitmq-env.conf $PKG/etc/rabbitmq/rabbitmq-env.conf.new
-install -m 644 docs/rabbitmq.config.example ${PKG}/etc/rabbitmq/
+install -m 644 deps/rabbit/docs/rabbitmq.config.example ${PKG}/etc/rabbitmq/
 chown -R $RABBITMQ_USER:$RABBITMQ_GROUP $PKG/etc/rabbitmq
 
 mkdir -p ${PKG}/etc/rc.d
 install -o root -g root -m 644 $CWD/rc.rabbitmq $PKG/etc/rc.d/rc.rabbitmq.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CONTRIBUTING.md LICENSE  README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md LICENSE* CODE_OF_CONDUCT.md $PKG/usr/doc/$PRGNAM-$VERSION
+find deps -maxdepth 1 -type d ! -path deps |
+while read dir
+do
+  mkdir -p ${PKG}/usr/doc/$PRGNAM-$VERSION/${dir/deps\//}
+done
+find deps -maxdepth 2 \
+     -name "README*" -o -name "CODE_OF_CONDUCT*" \
+     -o -name "LICENSE*" -o -name "CONTRIBUTING*" |
+while read file
+do
+  install -m 644 $file $PKG/usr/doc/$PRGNAM-$VERSION/${file/deps\//}
+done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/rabbitmq-server/rabbitmq-server.info b/system/rabbitmq-server/rabbitmq-server.info
index 7a557f01069a6..6ee846b7f53a5 100644
--- a/system/rabbitmq-server/rabbitmq-server.info
+++ b/system/rabbitmq-server/rabbitmq-server.info
@@ -1,8 +1,8 @@
 PRGNAM="rabbitmq-server"
-VERSION="3.6.0"
+VERSION="3.6.6"
 HOMEPAGE="https://www.rabbitmq.com/"
-DOWNLOAD="https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.0/rabbitmq-server-3.6.0.tar.xz"
-MD5SUM="b47c4b292c73751c4132d72521b5bfe4"
+DOWNLOAD="https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.6/rabbitmq-server-3.6.6.tar.xz"
+MD5SUM="138e334d3b5565aa4bce2a1e5b3a913c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="erlang-otp"