[Python-modules-commits] [celery] 02/03: merge patched into master

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository celery.

commit b0fad60a65b8c08f8ae66b68089f7757887e7c12
Merge: 1ffbb50 8af58d6
Author: Brian May <bam at debian.org>
Date:   Wed May 25 18:07:34 2016 +1000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../patches/0007-Set-shell-in-su-invocation.patch  | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 extra/generic-init.d/celerybeat                    |  2 +-
 extra/generic-init.d/celeryd                       |  2 +-
 5 files changed, 43 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index cba4d92,0000000..60cc778
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 0026d0040dada5f52ab66d37baee8baf4e4d2e99
- 0026d0040dada5f52ab66d37baee8baf4e4d2e99
++8af58d646c13cbd52374f855d522f48b580b3089
++8af58d646c13cbd52374f855d522f48b580b3089
 +6753277798b7b79fec667e858b4cbf459c1c277c
 +6753277798b7b79fec667e858b4cbf459c1c277c
 +celery_3.1.23.orig.tar.gz
 +4c51da2190dee77e723b658a939809fd74f4da96
 +1310624
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0007-Set-shell-in-su-invocation.patch
index 0000000,0000000..c5d3932
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-Set-shell-in-su-invocation.patch
@@@ -1,0 -1,0 +1,38 @@@
++From 8af58d646c13cbd52374f855d522f48b580b3089 Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Wed, 25 May 2016 18:06:17 +1000
++Subject: Set shell in su invocation
++
++See Bug#824786: celeryd: Initscript doesn't start daemon,
++http://bugs.debian.org/824786
++---
++ extra/generic-init.d/celerybeat | 2 +-
++ extra/generic-init.d/celeryd    | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/extra/generic-init.d/celerybeat b/extra/generic-init.d/celerybeat
++index b6287ad..78aa25a 100755
++--- a/extra/generic-init.d/celerybeat
+++++ b/extra/generic-init.d/celerybeat
++@@ -249,7 +249,7 @@ stop_beat () {
++ }
++ 
++ _chuid () {
++-    su "$CELERYBEAT_USER" -c "$CELERYBEAT $*"
+++    su "$CELERYBEAT_USER" --shell=/bin/sh -c "$CELERYBEAT $*"
++ }
++ 
++ start_beat () {
++diff --git a/extra/generic-init.d/celeryd b/extra/generic-init.d/celeryd
++index 6c2f866..7ad4599 100755
++--- a/extra/generic-init.d/celeryd
+++++ b/extra/generic-init.d/celeryd
++@@ -241,7 +241,7 @@ _get_pids() {
++ 
++ 
++ _chuid () {
++-    su "$CELERYD_USER" -c "$CELERYD_MULTI $*"
+++    su "$CELERYD_USER" --shell=/bin/sh -c "$CELERYD_MULTI $*"
++ }
++ 
++ 
diff --cc debian/patches/series
index ad551b6,0000000..5663167
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
 +drop_downgrade.patch
 +lsb-init.patch
 +intersphinx.patch
 +disable_unstable_tests.patch
 +privacy.patch
 +0006-ci-Tests-passing-on-Python-3.5.patch
++0007-Set-shell-in-su-invocation.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/celery.git