[supervisor] Add patch to prevent 'supervisorctl start' command from hanging if system time has rolled backward

.gitignore

@@ -35,6 +35,7 @@ src/sonic-device-data/src/device/
 src/sonic-device-data/src/debian/
 src/supervisor/*
 !src/supervisor/Makefile
+!src/supervisor/patch/
 src/thrift/*
 !src/thrift/Makefile
 

rules/supervisor.mk

@@ -1,5 +1,9 @@
 # supervisor package
 
-SUPERVISOR = python-supervisor_3.3.2-1_all.deb
+SUPERVISOR_VERSION = 3.3.2
+
+export SUPERVISOR_VERSION
+
+SUPERVISOR = python-supervisor_$(SUPERVISOR_VERSION)-1_all.deb
 $(SUPERVISOR)_SRC_PATH = $(SRC_PATH)/supervisor
 SONIC_MAKE_DEBS += $(SUPERVISOR)

src/supervisor/Makefile

@@ -2,7 +2,7 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-MAIN_TARGET = python-supervisor_3.3.2-1_all.deb
+MAIN_TARGET = python-supervisor_$(SUPERVISOR_VERSION)-1_all.deb
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Remove any stale files
@@ -11,7 +11,15 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Clone supervisor repo
 	git clone https://github.com/Supervisor/supervisor.git
 	pushd ./supervisor
-	git checkout -f 3.3.2
+
+	# Reset HEAD to the commit of the proper tag
+	# NOTE: Using "git checkout <tag_name>" here detaches our HEAD,
+	# which stg doesn't like, so we use this method instead
+	git reset --hard $(SUPERVISOR_VERSION)
+
+	# Apply patches
+	stg init
+	stg import -s ../patch/series
 
 	# Build Python and Debian package
 	python setup.py --command-packages=stdeb.command bdist_deb

src/supervisor/patch/0001-Prevent-supervisorctl-start-from-hanging-if-system-t.patch

@@ -0,0 +1,28 @@
+From 9ce7c3273d78dc412e3a1e3c95307a63846bad39 Mon Sep 17 00:00:00 2001
+From: Joe LeVeque <jolevequ@microsoft.com>
+Date: Tue, 16 Jan 2018 20:42:13 +0000
+Subject: [PATCH] Prevent 'supervisorctl start' from hanging if system time
+ rolls backward
+
+---
+ supervisor/process.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/supervisor/process.py b/supervisor/process.py
+index f9ddcd9..d292421 100644
+--- a/supervisor/process.py
++++ b/supervisor/process.py
+@@ -588,6 +588,10 @@ class Subprocess:
+
+         logger = self.config.options.logger
+
++        # If system clock has moved backward, reset self.laststart to current system time
++        if now < self.laststart:
++            self.laststart = now;
++
+         if self.config.options.mood > SupervisorStates.RESTARTING:
+             # dont start any processes if supervisor is shutting down
+             if state == ProcessStates.EXITED:
+-- 
+2.1.4
+

src/supervisor/patch/series

@@ -0,0 +1 @@
+0001-Prevent-supervisorctl-start-from-hanging-if-system-t.patch