py-supervisor: updated to 4.1.0

4.1.0:
- Fixed a bug on Python 3 only where logging to syslog did not work and
  would log the exception ``TypeError: a bytes-like object is required, not 'str'``
  to the main ``supervisord`` log file.

- Fixed a Python 3.8 compatibility issue caused by the removal of
  ``cgi.escape()``.

- The ``meld3`` package is no longer a dependency.  A version of ``meld3``
  is now included within the ``supervisor`` package itself.

4.0.4:
- Fixed a bug where ``supervisorctl tail <name> stdout`` would actually tail
  ``stderr``.  Note that ``tail <name>`` without the explicit ``stdout``
  correctly tailed ``stdout``.  The bug existed since 3.0a3 (released in
  2007).

- Improved the warning message added in 4.0.3 so it is now emitted for
  both ``tail`` and ``tail -f``.

- CVE-2019-12105.  Documentation addition only, no code changes.  This CVE
  states that ``inet_http_server`` does not use authentication by default
  (`details <https://github.com/Supervisor/supervisor/issues/1245>`_).  Note that
  ``inet_http_server`` is not enabled by default, and is also not enabled
  in the example configuration output by ``echo_supervisord_conf``.  The
  behavior of the ``inet_http_server`` options have been correctly documented,
  and have not changed, since the feature was introduced in 2006.  A new
  `warning message <https://github.com/Supervisor/supervisor/commit/4e334d9cf2a1daff685893e35e72398437df3dcb>`_
  was added to the documentation.

4.0.3:
- Fixed an issue on Python 2 where running ``supervisorctl tail -f <name>``
  would fail with the message
  ``Cannot connect, error: <type 'exceptions.UnicodeEncodeError'>`` where it
  may have worked on Supervisor 3.x.  The issue was introduced in Supervisor
  4.0.0 due to new bytes/strings conversions necessary to add Python 3 support.
  For ``supervisorctl`` to correctly display logs with Unicode characters, the
  terminal encoding specified by the environment must support it.  If not, the
  ``UnicodeEncodeError`` may still occur on either Python 2 or 3.  A new
  warning message is now printed if a problematic terminal encoding is
  detected.

4.0.2:
- Fixed a bug where inline comments in the config file were not parsed
  correctly such that the comments were included as part of the values.
  This only occurred on Python 2, and only where the environment had an
  extra ``configparser`` module installed.  The bug was introduced in
  Supervisor 4.0.0 because of Python 2/3 compatibility code that expected
  a Python 2 environment to only have a ``ConfigParser`` module.

4.0.1:
- Fixed an issue on Python 3 where an ``OSError: [Errno 29] Illegal seek``
  would occur if ``logfile`` in the ``[supervisord]`` section was set to
  a special file like ``/dev/stdout`` that was not seekable, even if
  ``logfile_maxbytes = 0`` was set to disable rotation.  The issue only
  affected the main log and not child logs.

4.0.0:
- Support for Python 3 has been added.  On Python 3, Supervisor requires
  Python 3.4 or later.  Many thanks to Vinay Sajip, Scott Maxwell, Palm Kevin,
  Tres Seaver, Marc Abramowitz, Son Nguyen, Shane Hathaway, Evan Andrews,
  and Ethan Hann who all made major contributions to the Python 3 porting
  effort.  Thanks also to all contributors who submitted issue reports and
  patches towards this effort.

- Support for Python 2.4, 2.5, and 2.6 has been dropped.  On Python 2,
  Supervisor now requires Python 2.7.

- The ``supervisor`` package is no longer a namespace package.

- The behavior of the config file expansion ``%(here)s`` has changed.  In
  previous versions, a bug caused ``%(here)s`` to always expand to the
  directory of the root config file.  Now, when ``%(here)s`` is used inside
  a file included via ``[include]``, it will expand to the directory of
  that file.  Thanks to Alex Eftimie and Zoltan Toth-Czifra for the patches.

- The default value for the config file setting ``exitcodes=``, the expected
  exit codes of a program, has changed.  In previous versions, it was ``0,2``.
  This caused issues with Golang programs where ``panic()`` causes the exit
  code to be ``2``.  The default value for ``exitcodes`` is now ``0``.

- An undocumented feature where multiple ``supervisorctl`` commands could be
  combined on a single line separated by semicolons has been removed.

- ``supervisorctl`` will now set its exit code to a non-zero value when an
  error condition occurs.  Previous versions did not set the exit code for
  most error conditions so it was almost always 0.

- Added new ``stdout_syslog`` and ``stderr_syslog`` options to the config
  file.  These are boolean options that indicate whether process output will
  be sent to syslog.  Supervisor can now log to both files and syslog at the
  same time.  Specifying a log filename of ``syslog`` is still supported
  but deprecated.

4 files changed, 67 insertions, 30 deletions

diff --git a/sysutils/py-supervisor/ALTERNATIVES b/sysutils/py-supervisor/ALTERNATIVES
new file mode 100644
index 00000000000..f15cd81e50e
--- /dev/null
+++ b/sysutils/py-supervisor/ALTERNATIVES
@@ -0,0 +1,4 @@
+bin/echo_supervisord_conf @PREFIX@/bin/echo_supervisord_conf-@PYVERSSUFFIX@
+bin/pidproxy @PREFIX@/bin/pidproxy-@PYVERSSUFFIX@
+bin/supervisorctl @PREFIX@/bin/supervisorctl-@PYVERSSUFFIX@
+bin/supervisord @PREFIX@/bin/supervisord-@PYVERSSUFFIX@
diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile
index e295e605438..a006f98b00f 100644
--- a/sysutils/py-supervisor/Makefile
+++ b/sysutils/py-supervisor/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2019/01/08 09:42:26 adam Exp $
+# $NetBSD: Makefile,v 1.6 2020/03/02 20:33:30 adam Exp $
 
-DISTNAME=	supervisor-3.3.5
+DISTNAME=	supervisor-4.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/supervisor/}
@@ -10,19 +10,25 @@ HOMEPAGE=	http://supervisord.org/
 COMMENT=	System for controlling process state under UNIX
 LICENSE=	original-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-meld3>=0.6.5:../../www/py-meld3
+.include "../../lang/python/pyversion.mk"
+.if ${_PYTHON_VERSION} == 27
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-
-# as of 3.3.1, explicitly only supports 2.x
-PYTHON_VERSIONS_ACCEPTED=	27
+.endif
 
 REPLACE_PYTHON+=	supervisor/scripts/*.py
 
 SUBST_CLASSES+=		python
-SUBST_SED.python+=	-e "s,<<PYTHON>>,${PYTHONBIN},"
-SUBST_FILES.python+=	supervisor/tests/fixtures/*.py
-SUBST_MESSAGE.python=	Fixing path to python.
 SUBST_STAGE.python=	pre-build
+SUBST_MESSAGE.python=	Fixing Python path.
+SUBST_FILES.python+=	supervisor/tests/fixtures/unkillable_spew.py
+SUBST_FILES.python+=	supervisor/tests/fixtures/spew.py
+SUBST_SED.python+=	-e "s,<<PYTHON>>,${PYTHONBIN},"
+
+post-install:
+.for bin in echo_supervisord_conf pidproxy supervisorctl supervisord
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
+.endfor
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/sysutils/py-supervisor/PLIST b/sysutils/py-supervisor/PLIST
index 89c5026d2d7..37805140b76 100644
--- a/sysutils/py-supervisor/PLIST
+++ b/sysutils/py-supervisor/PLIST
@@ -1,20 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2017/04/28 14:52:29 wiz Exp $
-bin/echo_supervisord_conf
-bin/pidproxy
-bin/supervisorctl
-bin/supervisord
-${PYSITELIB}/${EGG_NAME}-nspkg.pth
+@comment $NetBSD: PLIST,v 1.2 2020/03/02 20:33:30 adam Exp $
+bin/echo_supervisord_conf-${PYVERSSUFFIX}
+bin/pidproxy-${PYVERSSUFFIX}
+bin/supervisorctl-${PYVERSSUFFIX}
+bin/supervisord-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/namespace_packages.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/supervisor/__init__.py
+${PYSITELIB}/supervisor/__init__.pyc
+${PYSITELIB}/supervisor/__init__.pyo
 ${PYSITELIB}/supervisor/childutils.py
 ${PYSITELIB}/supervisor/childutils.pyc
 ${PYSITELIB}/supervisor/childutils.pyo
+${PYSITELIB}/supervisor/compat.py
+${PYSITELIB}/supervisor/compat.pyc
+${PYSITELIB}/supervisor/compat.pyo
 ${PYSITELIB}/supervisor/confecho.py
 ${PYSITELIB}/supervisor/confecho.pyc
 ${PYSITELIB}/supervisor/confecho.pyo
@@ -66,18 +70,12 @@ ${PYSITELIB}/supervisor/medusa/http_server.pyo
 ${PYSITELIB}/supervisor/medusa/logger.py
 ${PYSITELIB}/supervisor/medusa/logger.pyc
 ${PYSITELIB}/supervisor/medusa/logger.pyo
-${PYSITELIB}/supervisor/medusa/m_syslog.py
-${PYSITELIB}/supervisor/medusa/m_syslog.pyc
-${PYSITELIB}/supervisor/medusa/m_syslog.pyo
-${PYSITELIB}/supervisor/medusa/medusa_gif.py
-${PYSITELIB}/supervisor/medusa/medusa_gif.pyc
-${PYSITELIB}/supervisor/medusa/medusa_gif.pyo
 ${PYSITELIB}/supervisor/medusa/producers.py
 ${PYSITELIB}/supervisor/medusa/producers.pyc
 ${PYSITELIB}/supervisor/medusa/producers.pyo
-${PYSITELIB}/supervisor/medusa/status_handler.py
-${PYSITELIB}/supervisor/medusa/status_handler.pyc
-${PYSITELIB}/supervisor/medusa/status_handler.pyo
+${PYSITELIB}/supervisor/medusa/util.py
+${PYSITELIB}/supervisor/medusa/util.pyc
+${PYSITELIB}/supervisor/medusa/util.pyo
 ${PYSITELIB}/supervisor/medusa/xmlrpc_handler.py
 ${PYSITELIB}/supervisor/medusa/xmlrpc_handler.pyc
 ${PYSITELIB}/supervisor/medusa/xmlrpc_handler.pyo
@@ -124,6 +122,9 @@ ${PYSITELIB}/supervisor/supervisorctl.pyo
 ${PYSITELIB}/supervisor/supervisord.py
 ${PYSITELIB}/supervisor/supervisord.pyc
 ${PYSITELIB}/supervisor/supervisord.pyo
+${PYSITELIB}/supervisor/templating.py
+${PYSITELIB}/supervisor/templating.pyc
+${PYSITELIB}/supervisor/templating.pyo
 ${PYSITELIB}/supervisor/tests/__init__.py
 ${PYSITELIB}/supervisor/tests/__init__.pyc
 ${PYSITELIB}/supervisor/tests/__init__.pyo
@@ -131,9 +132,26 @@ ${PYSITELIB}/supervisor/tests/base.py
 ${PYSITELIB}/supervisor/tests/base.pyc
 ${PYSITELIB}/supervisor/tests/base.pyo
 ${PYSITELIB}/supervisor/tests/fixtures/donothing.conf
+${PYSITELIB}/supervisor/tests/fixtures/example/included.conf
+${PYSITELIB}/supervisor/tests/fixtures/include.conf
+${PYSITELIB}/supervisor/tests/fixtures/issue-1054.conf
+${PYSITELIB}/supervisor/tests/fixtures/issue-1224.conf
+${PYSITELIB}/supervisor/tests/fixtures/issue-1231.conf
+${PYSITELIB}/supervisor/tests/fixtures/issue-565.conf
+${PYSITELIB}/supervisor/tests/fixtures/issue-638.conf
+${PYSITELIB}/supervisor/tests/fixtures/issue-663.conf
+${PYSITELIB}/supervisor/tests/fixtures/issue-664.conf
+${PYSITELIB}/supervisor/tests/fixtures/issue-835.conf
+${PYSITELIB}/supervisor/tests/fixtures/issue-836.conf
+${PYSITELIB}/supervisor/tests/fixtures/listener.py
+${PYSITELIB}/supervisor/tests/fixtures/listener.pyc
+${PYSITELIB}/supervisor/tests/fixtures/listener.pyo
 ${PYSITELIB}/supervisor/tests/fixtures/spew.py
 ${PYSITELIB}/supervisor/tests/fixtures/spew.pyc
 ${PYSITELIB}/supervisor/tests/fixtures/spew.pyo
+${PYSITELIB}/supervisor/tests/fixtures/test_1231.py
+${PYSITELIB}/supervisor/tests/fixtures/test_1231.pyc
+${PYSITELIB}/supervisor/tests/fixtures/test_1231.pyo
 ${PYSITELIB}/supervisor/tests/fixtures/unkillable_spew.py
 ${PYSITELIB}/supervisor/tests/fixtures/unkillable_spew.pyc
 ${PYSITELIB}/supervisor/tests/fixtures/unkillable_spew.pyo
@@ -149,12 +167,18 @@ ${PYSITELIB}/supervisor/tests/test_datatypes.pyo
 ${PYSITELIB}/supervisor/tests/test_dispatchers.py
 ${PYSITELIB}/supervisor/tests/test_dispatchers.pyc
 ${PYSITELIB}/supervisor/tests/test_dispatchers.pyo
+${PYSITELIB}/supervisor/tests/test_end_to_end.py
+${PYSITELIB}/supervisor/tests/test_end_to_end.pyc
+${PYSITELIB}/supervisor/tests/test_end_to_end.pyo
 ${PYSITELIB}/supervisor/tests/test_events.py
 ${PYSITELIB}/supervisor/tests/test_events.pyc
 ${PYSITELIB}/supervisor/tests/test_events.pyo
 ${PYSITELIB}/supervisor/tests/test_http.py
 ${PYSITELIB}/supervisor/tests/test_http.pyc
 ${PYSITELIB}/supervisor/tests/test_http.pyo
+${PYSITELIB}/supervisor/tests/test_http_client.py
+${PYSITELIB}/supervisor/tests/test_http_client.pyc
+${PYSITELIB}/supervisor/tests/test_http_client.pyo
 ${PYSITELIB}/supervisor/tests/test_loggers.py
 ${PYSITELIB}/supervisor/tests/test_loggers.pyc
 ${PYSITELIB}/supervisor/tests/test_loggers.pyo
@@ -182,6 +206,9 @@ ${PYSITELIB}/supervisor/tests/test_supervisorctl.pyo
 ${PYSITELIB}/supervisor/tests/test_supervisord.py
 ${PYSITELIB}/supervisor/tests/test_supervisord.pyc
 ${PYSITELIB}/supervisor/tests/test_supervisord.pyo
+${PYSITELIB}/supervisor/tests/test_templating.py
+${PYSITELIB}/supervisor/tests/test_templating.pyc
+${PYSITELIB}/supervisor/tests/test_templating.pyo
 ${PYSITELIB}/supervisor/tests/test_web.py
 ${PYSITELIB}/supervisor/tests/test_web.pyc
 ${PYSITELIB}/supervisor/tests/test_web.pyo
diff --git a/sysutils/py-supervisor/distinfo b/sysutils/py-supervisor/distinfo
index 5b1cdb875a1..ffbb8b75164 100644
--- a/sysutils/py-supervisor/distinfo
+++ b/sysutils/py-supervisor/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2019/01/08 09:42:26 adam Exp $
+$NetBSD: distinfo,v 1.6 2020/03/02 20:33:30 adam Exp $
 
-SHA1 (supervisor-3.3.5.tar.gz) = ac5c766e7446dbf2911bd080e11b6b93cf72738c
-RMD160 (supervisor-3.3.5.tar.gz) = 17a597a23d121f9c830a0104add78540d97e6a55
-SHA512 (supervisor-3.3.5.tar.gz) = 66c43d40c216e5c3120e083407c848295fa1e59d6d9da916a4bae5c37d4d13208c3bf7c0c8b8a5d570270eb44fac0b1bbcceddb2e84e4f3fc1b6241b43116af7
-Size (supervisor-3.3.5.tar.gz) = 421220 bytes
+SHA1 (supervisor-4.1.0.tar.gz) = 018a7250211f3a947f806be7fbe1ab6e9d639d35
+RMD160 (supervisor-4.1.0.tar.gz) = 1c3abbe97894c3ea946e48585736ae25f11ec69b
+SHA512 (supervisor-4.1.0.tar.gz) = 1ae343293707ebf33d0a0c0bda2c6cc78278e12737940a79e51b2365e7a20b07d9f5e50134ed2abbf8e7af1ebd8f1746002a159cde1cfc35e83fda0a77dae9c5
+Size (supervisor-4.1.0.tar.gz) = 459020 bytes