diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2015-09-24 21:44:24 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2015-09-24 21:44:24 +0200 |
| commit | e35e05833ad9a36f7461e94f59666b16083cc984 (patch) | |
| tree | bf7614a29ce522466d4f56b0391c6da20b541978 | |
| parent | a736305139e7c42bb36a7509a4044f3c95e08614 (diff) | |
| parent | 3136aa25752542dfdbc7af3f77d8a66eb8d5d844 (diff) | |
| download | rabbitmq-server-git-e35e05833ad9a36f7461e94f59666b16083cc984.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 5 | ||||
| -rw-r--r-- | packaging/common/rabbitmq-script-wrapper | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/changelog | 6 |
4 files changed, 12 insertions, 3 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 96888d9c0c..8764d29bec 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -2,7 +2,7 @@ Name: rabbitmq-server Version: %%VERSION%% -Release: 1%{?dist} +Release: 3%{?dist} License: MPLv1.1 and MIT and ASL 2.0 and BSD Group: %{group_tag} Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz @@ -132,6 +132,9 @@ done rm -rf %{buildroot} %changelog +* Thu Sep 24 2015 jean-sebastien@rabbitmq.com 3.5.5-3 +- Fix bashism in rabbitmq-script-wrapper + * Thu Sep 24 2015 jean-sebastien@rabbitmq.com 3.5.5-1 - New Upstream Release diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper index 67fa669a4d..ed4c276e53 100644 --- a/packaging/common/rabbitmq-script-wrapper +++ b/packaging/common/rabbitmq-script-wrapper @@ -22,7 +22,7 @@ fi for arg in "$@" ; do # Wrap each arg in single quotes and wrap single quotes in double quotes, so that they're passed through cleanly. - arg=`printf %s $arg | sed $SED_OPT -e "s/'/'\"'\"'/g"` + arg=`printf %s "$arg" | sed $SED_OPT -e "s/'/'\"'\"'/g"` CMDLINE="${CMDLINE} '${arg}'" done diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index 354f091872..d9064c8729 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -30,7 +30,7 @@ package: clean cat $(UNPACKED_DIR)/LICENSE >> $(UNPACKED_DIR)/debian/copyright echo "\n\nThe Debian packaging is (C) 2007-2013, GoPivotal, Inc. and is licensed\nunder the MPL 1.1, see above.\n" >> $(UNPACKED_DIR)/debian/copyright UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) - cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) + cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -sa -rfakeroot $(SIGNING) rm -rf $(UNPACKED_DIR) clean: diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog index 7942e035c4..2a28ddf507 100644 --- a/packaging/debs/Debian/debian/changelog +++ b/packaging/debs/Debian/debian/changelog @@ -1,3 +1,9 @@ +rabbitmq-server (3.5.5-3) unstable; urgency=low + + * Fix bashism in rabbitmq-script-wrapper + + -- Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> Thu, 24 Sep 2015 19:18:17 +0100 + rabbitmq-server (3.5.5-1) unstable; urgency=low * New Upstream Release |