--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package celery
Fixes bashisms in initd scripts. See #858298. Patch is from upstream.
diff -Nru celery-3.1.23/debian/changelog celery-3.1.23/debian/changelog
--- celery-3.1.23/debian/changelog 2017-03-24 17:00:36.000000000 +1100
+++ celery-3.1.23/debian/changelog 2017-03-30 07:55:02.000000000 +1100
@@ -1,3 +1,9 @@
+celery (3.1.23-7) unstable; urgency=medium
+
+ * Fix bashisms in initd scripts. Closes: #858298.
+
+ -- Brian May <bam@debian.org> Thu, 30 Mar 2017 07:55:02 +1100
+
celery (3.1.23-6) unstable; urgency=medium
* Change celeryd to depend on python-celery-common instead of python-celery.
diff -Nru celery-3.1.23/debian/.git-dpm celery-3.1.23/debian/.git-dpm
--- celery-3.1.23/debian/.git-dpm 2016-05-25 18:07:35.000000000 +1000
+++ celery-3.1.23/debian/.git-dpm 2017-03-30 07:20:15.000000000 +1100
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-8af58d646c13cbd52374f855d522f48b580b3089
-8af58d646c13cbd52374f855d522f48b580b3089
+fe0a322f110f182dc98d703815d17663fa5ac893
+fe0a322f110f182dc98d703815d17663fa5ac893
6753277798b7b79fec667e858b4cbf459c1c277c
6753277798b7b79fec667e858b4cbf459c1c277c
celery_3.1.23.orig.tar.gz
diff -Nru celery-3.1.23/debian/patches/0008-Remove-bashisms-from-initd-scripts.patch celery-3.1.23/debian/patches/0008-Remove-bashisms-from-initd-scripts.patch
--- celery-3.1.23/debian/patches/0008-Remove-bashisms-from-initd-scripts.patch 1970-01-01 10:00:00.000000000 +1000
+++ celery-3.1.23/debian/patches/0008-Remove-bashisms-from-initd-scripts.patch 2017-03-30 07:20:15.000000000 +1100
@@ -0,0 +1,53 @@
+From fe0a322f110f182dc98d703815d17663fa5ac893 Mon Sep 17 00:00:00 2001
+From: Ask Solem <ask@celeryproject.org>
+Date: Mon, 23 May 2016 13:45:39 -0700
+Subject: Remove bashisms from initd scripts
+
+Patch from
+https://github.com/celery/celery/commit/44c0ebf9c46406988e5002f8a78aa2dd506451d6
+---
+ extra/generic-init.d/celerybeat | 9 +++++++--
+ extra/generic-init.d/celeryd | 7 ++++++-
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/extra/generic-init.d/celerybeat b/extra/generic-init.d/celerybeat
+index 78aa25a..a1596a3 100755
+--- a/extra/generic-init.d/celerybeat
++++ b/extra/generic-init.d/celerybeat
+@@ -33,9 +33,14 @@ if [ $(id -u) -ne 0 ]; then
+ exit 1
+ fi
+
++origin_is_runlevel_dir () {
++ set +e
++ dirname $0 | grep -q "/etc/rc.\.d"
++ echo $?
++}
+
+-# May be a runlevel symlink (e.g. S02celeryd)
+-if [ -L "$0" ]; then
++# Can be a runlevel symlink (e.g. S02celeryd)
++if [ $(origin_is_runlevel_dir) -eq 0 ]; then
+ SCRIPT_FILE=$(readlink "$0")
+ else
+ SCRIPT_FILE="$0"
+diff --git a/extra/generic-init.d/celeryd b/extra/generic-init.d/celeryd
+index 7ad4599..d88e029 100755
+--- a/extra/generic-init.d/celeryd
++++ b/extra/generic-init.d/celeryd
+@@ -41,9 +41,14 @@ if [ $(id -u) -ne 0 ]; then
+ exit 1
+ fi
+
++origin_is_runlevel_dir () {
++ set +e
++ dirname $0 | grep -q "/etc/rc.\.d"
++ echo $?
++}
+
+ # Can be a runlevel symlink (e.g. S02celeryd)
+-if [[ `dirname $0` == /etc/rc*.d ]]; then
++if [ $(origin_is_runlevel_dir) -eq 0 ]; then
+ SCRIPT_FILE=$(readlink "$0")
+ else
+ SCRIPT_FILE="$0"
diff -Nru celery-3.1.23/debian/patches/series celery-3.1.23/debian/patches/series
--- celery-3.1.23/debian/patches/series 2016-05-25 18:07:35.000000000 +1000
+++ celery-3.1.23/debian/patches/series 2017-03-30 07:20:15.000000000 +1100
@@ -5,3 +5,4 @@
privacy.patch
0006-ci-Tests-passing-on-Python-3.5.patch
0007-Set-shell-in-su-invocation.patch
+0008-Remove-bashisms-from-initd-scripts.patch
unblock celery/3.1.23-7
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (100, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--- End Message ---