Date: Wednesday, February 21, 2018 @ 15:15:48 Author: anthraxx Revision: 296683
upgpkg: rabbitmq 3.7.3-1 Added: rabbitmq/trunk/rabbitmq-customize-systemd-service.patch rabbitmq/trunk/rabbitmq.logrotate Modified: rabbitmq/trunk/PKGBUILD rabbitmq/trunk/rabbitmq-env.conf Deleted: rabbitmq/trunk/rabbitmq-script-wrapper rabbitmq/trunk/rabbitmq.service ------------------------------------------+ PKGBUILD | 54 +++++++++++++++-------------- rabbitmq-customize-systemd-service.patch | 53 ++++++++++++++++++++++++++++ rabbitmq-env.conf | 3 - rabbitmq-script-wrapper | 48 ------------------------- rabbitmq.logrotate | 6 +++ rabbitmq.service | 15 -------- 6 files changed, 88 insertions(+), 91 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-21 15:10:01 UTC (rev 296682) +++ PKGBUILD 2018-02-21 15:15:48 UTC (rev 296683) @@ -8,59 +8,63 @@ # Contributor: mutantmonkey pkgname=rabbitmq -pkgver=3.6.14 +pkgver=3.7.3 pkgrel=1 pkgdesc='Highly reliable and performant enterprise messaging implementation of AMQP written in Erlang/OTP' url='https://rabbitmq.com' arch=('any') license=('MPL') -depends=('util-linux' 'inetutils' 'erlang-nox') -optdepends=('rabbitmqadmin: CLI management tool') +depends=('util-linux' 'inetutils' 'erlang-nox' 'socat') +optdepends=('rabbitmqadmin: CLI management tool' + 'logrotate: rotate log files') +makedepends=('zip' 'unzip' 'libxslt' 'xmlto' 'systemd' 'elixir' 'python' 'python-simplejson' 'rsync') backup=('etc/rabbitmq/rabbitmq-env.conf') +options=('!makeflags') install=rabbitmq.install -source=(https://www.rabbitmq.com/releases/${pkgname}-server/v${pkgver}/${pkgname}-server-generic-unix-${pkgver}.tar.xz{,.asc} +source=(https://github.com/rabbitmq/rabbitmq-server/releases/download/v${pkgver}/rabbitmq-server-${pkgver}.tar.xz{,.asc} + rabbitmq-customize-systemd-service.patch rabbitmq-env.conf - rabbitmq.service rabbitmq.sysusers rabbitmq.tmpfiles - rabbitmq-script-wrapper) -sha512sums=('842a30d14f78f42fe765936d9ad38612cf90c4ec5b09f52d3fb06ad4eec0eddf54244cfc43086b9949eee39dc37b7d4bc12c5ffb4339efd717b45322b3dc5784' + rabbitmq.logrotate) +sha512sums=('337edddceb66c44b5cc3cec710918385306d9db97ae340752bc39a1be39229a58b3bb1c96763a2ce441a6d46135f2aac8cec09fc33591d0e14e7571c9507d79b' 'SKIP' - '4872ff514c9f841fe4c93bc442ec4e3177d1bfa3834e8d8a26fc77a63aff1cdc14944827673a59556e26210b2b4c0091f93c8e93a334710e5bc3336a64e77140' - 'd51b43f948febb23cdd5b0c7736f966d8433b05ccd95778e90d280d45ccfd9a714e888762f458337a784fff4b86430151adb0f81d779d6b99c9154fcd7e0e319' + '1a74f8c375fa363104993fac0ef6d05288fff6e104e796623e52d75ff9ca9893d217b4f9f8a219110f4ab2c5a157b8074343a16472a958f7882f8e2b9fc87c0e' + '8b841e28fa0a1424dd9e57c0988e015f3cd4cccef0f73ccdb7c7b66d11ca62ba8ef3a59c7ca5e5f0c9c9d8003ac72bf53785985d98aae867961787003286e179' '17d33e7104172bc265d97821fec58f1402ad3103f1ea4b1f6bbabcf0dd840685708a1bdc808b48c1a60726c5c0aa7b6479395afd9360d3116b812c143c432423' '5cbef5497029ff227050c6f18c4fcc35b3922747408d01b7590f096253af82a8a8f16008efcc8ea21f970ce87244de62e2e375f65c49e407e53440eada5d7114' - '3f271d546836eccc3bcf61105c013d3b590c3e2535106d07e5605a63174fd62ef204207367c2cd39be54e0246d0bbd9aecebe8b5cefe9018a766ceb8af70bc81') + 'f2a6aaa38e575e7c947191a7c67add1434beb768c50acb16d5faa5dd83d390a9a5ec7c153487add4ac26de058a02bbb5c3a7d6377e91a1d0cbcca3c1d6797b02') validpgpkeys=('0A9AF2115F4687BD29803A206B73A36E6026DFCA') # RabbitMQ Release Signing Key <[email protected]> prepare() { - cd ${pkgname}_server-${pkgver} - sed -r 's|^(SYS_PREFIX=).*$|\1""|' -i sbin/rabbitmq-defaults + cd ${pkgname}-server-${pkgver} + sed -r 's|^(SYS_PREFIX=).*$|\1""|' -i deps/rabbit/scripts/rabbitmq-defaults + patch -p1 < ../rabbitmq-customize-systemd-service.patch } +build() { + cd ${pkgname}-server-${pkgver} + make +} + package() { - cd ${pkgname}_server-${pkgver} - local libdir="${pkgdir}/usr/lib/rabbitmq/lib/rabbitmq-server-${pkgver}" + cd ${pkgname}-server-${pkgver} + make DESTDIR="${pkgdir}" PREFIX=/usr RMQ_ROOTDIR=/usr/lib/rabbitmq \ + install install-man install-bin - install -d "${libdir}" + # using script wrapper for better bin handling + local libdir="${pkgdir}/usr/lib/rabbitmq/lib/rabbitmq_server-${pkgver}" install -d "${pkgdir}/usr/bin" - - cp -R ebin "${libdir}" - cp -R include "${libdir}" - cp -R plugins "${libdir}" - cp -R sbin "${libdir}" - cp -R share "${pkgdir}/usr" - - install -Dm 755 "${srcdir}/rabbitmq-script-wrapper" -t "${pkgdir}/usr/lib/rabbitmq/bin" + install -Dm 755 scripts/rabbitmq-script-wrapper -t "${pkgdir}/usr/lib/rabbitmq/bin" for script in "${libdir}"/sbin/*; do - ln -s "${script#${pkgdir}}" "${pkgdir}/usr/lib/rabbitmq/bin" ln -s /usr/lib/rabbitmq/bin/rabbitmq-script-wrapper "${pkgdir}/usr/bin/${script#${libdir}/sbin/}" done + install -Dm 644 deps/rabbit/docs/rabbitmq-server.service.example "${pkgdir}/usr/lib/systemd/system/rabbitmq.service" install -Dm 644 "${srcdir}/rabbitmq-env.conf" "${pkgdir}/etc/rabbitmq/rabbitmq-env.conf" - install -Dm 644 "${srcdir}/rabbitmq.service" "${pkgdir}/usr/lib/systemd/system/rabbitmq.service" install -Dm 644 "${srcdir}/rabbitmq.sysusers" "${pkgdir}/usr/lib/sysusers.d/rabbitmq.conf" install -Dm 644 "${srcdir}/rabbitmq.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/rabbitmq.conf" + install -Dm 644 "${srcdir}/rabbitmq.logrotate" "${pkgdir}/etc/logrotate.d/rabbitmq" chown -R 197:0 "${pkgdir}/etc/rabbitmq" } Added: rabbitmq-customize-systemd-service.patch =================================================================== --- rabbitmq-customize-systemd-service.patch (rev 0) +++ rabbitmq-customize-systemd-service.patch 2018-02-21 15:15:48 UTC (rev 296683) @@ -0,0 +1,53 @@ +From 6990cfa74ea4864b11000b955ae3e5ea26e2b3f7 Mon Sep 17 00:00:00 2001 +From: anthraxx <[email protected]> +Date: Wed, 21 Feb 2018 15:26:12 +0100 +Subject: [PATCH] Customize systemd service file + +--- + deps/rabbit/docs/rabbitmq-server.service.example | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/deps/rabbit/docs/rabbitmq-server.service.example b/deps/rabbit/docs/rabbitmq-server.service.example +index f1ab926..9219394 100644 +--- a/deps/rabbit/docs/rabbitmq-server.service.example ++++ b/deps/rabbit/docs/rabbitmq-server.service.example +@@ -1,4 +1,3 @@ +-# systemd unit example + [Unit] + Description=RabbitMQ broker + After=network.target [email protected] +@@ -8,20 +7,29 @@ Wants=network.target [email protected] + Type=notify + User=rabbitmq + Group=rabbitmq ++SyslogIdentifier=rabbitmq ++EnvironmentFile=/etc/rabbitmq/rabbitmq-env.conf ++UMask=0027 + NotifyAccess=all + TimeoutStartSec=3600 ++# Un-comment this setting if you need to increase RabbitMQ's ++# open files limit ++# LimitNOFILE=16384 ++# + # Note: + # You *may* wish to add the following to automatically restart RabbitMQ + # in the event of a failure. systemd service restarts are not a + # replacement for service monitoring. Please see + # http://www.rabbitmq.com/monitoring.html + # +-# Restart=on-failure +-# RestartSec=10 ++Restart=on-failure ++RestartSec=10 + WorkingDirectory=/var/lib/rabbitmq + ExecStart=/usr/lib/rabbitmq/bin/rabbitmq-server + ExecStop=/usr/lib/rabbitmq/bin/rabbitmqctl stop + ExecStop=/bin/sh -c "while ps -p $MAINPID >/dev/null 2>&1; do sleep 1; done" ++# rabbitmq/rabbitmq-server-release#51 ++# SuccessExitStatus=69 + + [Install] + WantedBy=multi-user.target +-- +2.16.2 + Modified: rabbitmq-env.conf =================================================================== --- rabbitmq-env.conf 2018-02-21 15:10:01 UTC (rev 296682) +++ rabbitmq-env.conf 2018-02-21 15:15:48 UTC (rev 296683) @@ -1,6 +1,3 @@ NODENAME=rabbit NODE_IP_ADDRESS=0.0.0.0 NODE_PORT=5672 - -LOG_BASE=/var/log/rabbitmq -MNESIA_BASE=/var/lib/rabbitmq/mnesia Deleted: rabbitmq-script-wrapper =================================================================== --- rabbitmq-script-wrapper 2018-02-21 15:10:01 UTC (rev 296682) +++ rabbitmq-script-wrapper 2018-02-21 15:15:48 UTC (rev 296683) @@ -1,48 +0,0 @@ -#!/bin/sh -## The contents of this file are subject to the Mozilla Public License -## Version 1.1 (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License -## at http://www.mozilla.org/MPL/ -## -## Software distributed under the License is distributed on an "AS IS" -## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -## the License for the specific language governing rights and -## limitations under the License. -## -## The Original Code is RabbitMQ. -## -## The Initial Developer of the Original Code is GoPivotal, Inc. -## Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved. -## - -# Escape spaces and quotes, because shell is revolting. -for arg in "$@" ; do - # Escape quotes in parameters, so that they're passed through cleanly. - arg=$(sed -e 's/"/\\"/g' <<-END - $arg - END - ) - CMDLINE="${CMDLINE} \"${arg}\"" -done - -SCRIPT="$(basename "$0")" - -if [ $(id -u) = $(id -u rabbitmq) ] && [ "$SCRIPT" = "rabbitmq-server" ]; then - cd /var/lib/rabbitmq - /usr/lib/rabbitmq/bin/rabbitmq-server "$@" > "/var/log/rabbitmq/startup_log" 2> "/var/log/rabbitmq/startup_err" -elif [ $(id -u) = $(id -u rabbitmq) ]; then - cd /var/lib/rabbitmq - if [ -f "${PWD}/.erlang.cookie" ] ; then - export HOME=. - fi - "/usr/lib/rabbitmq/bin/${SCRIPT}" "$@" -elif [ $(id -u) = 0 ] ; then - cd /var/lib/rabbitmq - su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" -else - "/usr/lib/rabbitmq/bin/${SCRIPT}" - echo - echo "Only root or rabbitmq should run ${SCRIPT}" - echo - exit 1 -fi Added: rabbitmq.logrotate =================================================================== --- rabbitmq.logrotate (rev 0) +++ rabbitmq.logrotate 2018-02-21 15:15:48 UTC (rev 296683) @@ -0,0 +1,6 @@ +/var/log/rabbitmq/*.log { + missingok + notifempty + compress + create 640 rabbitmq rabbitmq +} Deleted: rabbitmq.service =================================================================== --- rabbitmq.service 2018-02-21 15:10:01 UTC (rev 296682) +++ rabbitmq.service 2018-02-21 15:15:48 UTC (rev 296683) @@ -1,15 +0,0 @@ -[Unit] -Description=RabbitMQ Messaging Server -After=network.target - -[Service] -Type=simple -User=rabbitmq -SyslogIdentifier=rabbitmq -EnvironmentFile=/etc/rabbitmq/rabbitmq-env.conf - -ExecStart=/usr/bin/rabbitmq-server -ExecStop=/usr/bin/rabbitmqctl stop - -[Install] -WantedBy=multi-user.target
