diff --git a/rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch b/rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch new file mode 100644 index 0000000..4e602cc --- /dev/null +++ b/rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch @@ -0,0 +1,62 @@ +From: Peter Lemenkov +Date: Tue, 7 Jan 2020 00:19:51 +0300 +Subject: [PATCH] Revert "Use template in rabbitmq-script-wrapper for RabbitMQ + user and group" + +This reverts commit ad99cb2524ebc5750a13c3c12203390926f7b5cb. + +diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec +index e72e845..08568b1 100644 +--- a/packaging/RPMS/Fedora/rabbitmq-server.spec ++++ b/packaging/RPMS/Fedora/rabbitmq-server.spec +@@ -42,8 +42,6 @@ RabbitMQ is an open source multi-protocol messaging broker. + %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins + %define _rabbit_server_ha_ocf scripts/rabbitmq-server-ha.ocf + %define _rabbitmqctl_autocomplete scripts/rabbitmqctl-autocomplete.sh +-%define _rabbitmq_user rabbitmq +-%define _rabbitmq_group rabbitmq + + + %define _maindir %{buildroot}%{_rabbit_erllibdir} +@@ -84,7 +82,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq + + mkdir -p %{buildroot}%{_sbindir} + sed -e 's|@STDOUT_STDERR_REDIRECTION@||' \ +- -e 's|@RABBITMQ_USER@|%{_rabbitmq_user}|' -e 's|@RABBITMQ_GROUP@|%{_rabbitmq_group}|' \ + < scripts/rabbitmq-script-wrapper \ + > %{buildroot}%{_sbindir}/rabbitmqctl + chmod 0755 %{buildroot}%{_sbindir}/rabbitmqctl +diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules +index 3cb4a2c..37df2cf 100755 +--- a/packaging/debs/Debian/debian/rules ++++ b/packaging/debs/Debian/debian/rules +@@ -5,8 +5,6 @@ + #export DH_VERBOSE=1 + + DEB_DESTDIR = debian/rabbitmq-server +-RABBITMQ_USER ?= rabbitmq +-RABBITMQ_GROUP ?= rabbitmq + + unexport DEPS_DIR + +@@ -34,7 +32,6 @@ override_dh_auto_install: + $(MAKE) install-bin DESTDIR=$(DEB_DESTDIR) + + sed -e 's|@STDOUT_STDERR_REDIRECTION@|> "$$RABBITMQ_LOG_BASE/startup_log" 2> "$$RABBITMQ_LOG_BASE/startup_err"|' \ +- -e 's|@RABBITMQ_USER@|$(RABBITMQ_USER)|' -e 's|@RABBITMQ_GROUP@|$(RABBITMQ_GROUP)|' \ + < scripts/rabbitmq-script-wrapper \ + > $(DEB_DESTDIR)$(PREFIX)/sbin/rabbitmqctl + chmod 0755 $(DEB_DESTDIR)$(PREFIX)/sbin/rabbitmqctl +diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper +index ad023e7..d1cffb9 100644 +--- a/scripts/rabbitmq-script-wrapper ++++ b/scripts/rabbitmq-script-wrapper +@@ -45,7 +45,7 @@ maybe_fixup_erlang_cookie() { + _erlang_cookie="$_rabbitmq_home/.erlang.cookie" + if [ -f "$_erlang_cookie" ] + then +- chown @RABBITMQ_USER@:@RABBITMQ_GROUP@ "$_erlang_cookie" ++ chown rabbitmq:rabbitmq "$_erlang_cookie" + chmod 400 "$_erlang_cookie" + fi + } diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 499623f..562a625 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -7,7 +7,7 @@ Name: rabbitmq-server Version: 3.8.2 -Release: 1%{?dist} +Release: 2%{?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 @@ -22,6 +22,7 @@ Patch4: rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS. 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 +Patch202: rabbitmq-server-release-0002-Revert-Use-template-in-rabbitmq-script-wrapper-for-R.patch Patch301: rabbitmq-amqp1.0-common-0001-force-python3.patch URL: https://www.rabbitmq.com/ @@ -76,6 +77,7 @@ cd deps/rabbit_common cd ../.. %patch201 -p1 +%patch202 -p1 cd deps/amqp10_common %patch301 -p1 @@ -203,6 +205,9 @@ done %changelog +* Tue Jan 7 2020 Peter Lemenkov - 3.8.2-2 +- Properly set up user/group on some script(s). + * Sat Dec 7 2019 Peter Lemenkov - 3.8.2-1 - Ver. 3.8.2