Update sysutils/supervisor to version 4.0.2.

OK solene@, thanks!
This commit is contained in:
edd 2019-05-04 15:08:44 +00:00
parent 57d0434c51
commit 2e90ec0115
5 changed files with 41 additions and 25 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2018/05/04 13:28:45 jasper Exp $
# $OpenBSD: Makefile,v 1.13 2019/05/04 15:08:44 edd Exp $
COMMENT= system to monitor and control processes
MODPY_EGG_VERSION = 3.3.4
MODPY_EGG_VERSION = 4.0.2
DISTNAME= supervisor-${MODPY_EGG_VERSION}
CATEGORIES= sysutils

View File

@ -1,2 +1,2 @@
SHA256 (supervisor-3.3.4.tar.gz) = ISIBo/0dNcFQ7ww1vwZ2/RpsGV+2C/DyFH/n29MX5nI=
SIZE (supervisor-3.3.4.tar.gz) = 419794
SHA256 (supervisor-4.0.2.tar.gz) = VgRFfaT7idhQ54wSggX+STjJJ3+HMBiFszyUxgNh5XU=
SIZE (supervisor-4.0.2.tar.gz) = 434408

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-supervisor_skel_sample_conf,v 1.5 2017/11/15 16:38:14 landry Exp $
$OpenBSD: patch-supervisor_skel_sample_conf,v 1.6 2019/05/04 15:08:44 edd Exp $
Index: supervisor/skel/sample.conf
--- supervisor/skel/sample.conf.orig
+++ supervisor/skel/sample.conf
@ -42,17 +42,17 @@ Index: supervisor/skel/sample.conf
+;startsecs=10 ; # of secs prog must stay up to be running (def. 1)
;startretries=3 ; max # of serial start failures when starting (default 3)
;autorestart=unexpected ; when to restart if exited after running (def: unexpected)
;exitcodes=0,2 ; 'expected' exit codes used with autorestart (default 0,2)
@@ -93,7 +93,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
;stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10)
;exitcodes=0 ; 'expected' exit codes used with autorestart (default 0)
@@ -95,7 +95,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
;stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0)
;stderr_events_enabled=false ; emit events on stderr writes (default false)
;stderr_syslog=false ; send stderr to syslog with process name (default false)
-;environment=A="1",B="2" ; process environment additions (def no adds)
+;environment=A=1,B=2 ; process environment additions (def no adds)
;serverurl=AUTO ; override serverurl computation (childutils)
; The sample eventlistener section below shows all possible eventlistener
@@ -110,7 +110,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
@@ -112,7 +112,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
;umask=022 ; umask for process (default None)
;priority=-1 ; the relative start priority (default -1)
;autostart=true ; start at supervisord start (default: true)
@ -60,17 +60,17 @@ Index: supervisor/skel/sample.conf
+;startsecs=10 ; # of secs prog must stay up to be running (def. 1)
;startretries=3 ; max # of serial start failures when starting (default 3)
;autorestart=unexpected ; autorestart if exited after running (def: unexpected)
;exitcodes=0,2 ; 'expected' exit codes used with autorestart (default 0,2)
@@ -128,7 +128,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
;stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB)
;exitcodes=0 ; 'expected' exit codes used with autorestart (default 0)
@@ -132,7 +132,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
;stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10)
;stderr_events_enabled=false ; emit events on stderr writes (default false)
;stderr_syslog=false ; send stderr to syslog with process name (default false)
-;environment=A="1",B="2" ; process environment additions
+;environment=A=1,B=2 ; process environment additions
;serverurl=AUTO ; override serverurl computation (childutils)
; The sample group section below shows all possible group values. Create one
@@ -144,5 +144,5 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
@@ -148,5 +148,5 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix://
; interpreted as relative to this file. Included files *cannot*
; include files themselves.

View File

@ -1,21 +1,24 @@
@comment $OpenBSD: PLIST,v 1.5 2017/11/15 16:38:14 landry Exp $
@comment $OpenBSD: PLIST,v 1.6 2019/05/04 15:08:44 edd Exp $
@rcscript ${RCDIR}/supervisord
bin/echo_supervisord_conf
bin/pidproxy
bin/supervisorctl
bin/supervisord
lib/python${MODPY_VERSION}/site-packages/supervisor/
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/supervisor-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/supervisor/__init__.py
lib/python${MODPY_VERSION}/site-packages/supervisor/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/childutils.py
lib/python${MODPY_VERSION}/site-packages/supervisor/childutils.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/compat.py
lib/python${MODPY_VERSION}/site-packages/supervisor/compat.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/confecho.py
lib/python${MODPY_VERSION}/site-packages/supervisor/confecho.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/datatypes.py
@ -51,14 +54,10 @@ lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/http_server.py
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/http_server.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/logger.py
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/logger.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/m_syslog.py
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/m_syslog.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/medusa_gif.py
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/medusa_gif.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/producers.py
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/producers.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/status_handler.py
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/status_handler.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/util.py
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/util.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/xmlrpc_handler.py
lib/python${MODPY_VERSION}/site-packages/supervisor/medusa/xmlrpc_handler.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/options.py
@ -100,6 +99,20 @@ lib/python${MODPY_VERSION}/site-packages/supervisor/tests/base.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/base.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/donothing.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/example/
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/example/included.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/example/issue-1184.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/include.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-1054.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-1224.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-565.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-638.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-663.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-664.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-835.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/issue-836.conf
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/listener.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/listener.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/spew.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/spew.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/fixtures/unkillable_spew.py
@ -112,10 +125,14 @@ lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_datatypes.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_datatypes.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_dispatchers.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_dispatchers.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_end_to_end.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_end_to_end.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_events.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_events.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_http.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_http.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_http_client.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_http_client.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_loggers.py
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_loggers.pyc
lib/python${MODPY_VERSION}/site-packages/supervisor/tests/test_options.py
@ -179,4 +196,3 @@ share/doc/supervisor/subprocess.rst
share/doc/supervisor/upgrading.rst
share/doc/supervisor/xmlrpc.rst
@sample ${SYSCONFDIR}/supervisord.d/
@rcscript ${RCDIR}/supervisord

View File

@ -1,9 +1,9 @@
#!/bin/ksh
#
# $OpenBSD: supervisord.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
# $OpenBSD: supervisord.rc,v 1.3 2019/05/04 15:08:44 edd Exp $
daemon="${TRUEPREFIX}/bin/supervisord"
daemon_flags="-c ${SYSCONFDIR}/supervisord.conf --pidfile /var/run/supervisor/supervisord.pid"
daemon_flags="-c ${SYSCONFDIR}/supervisord.conf"
. /etc/rc.d/rc.subr