Date: Tue, 10 Jan 2012 10:09:55 GMT From: Ildar Hizbulin <hizel@vyborg.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/163982: [MANTAINER UPDATE] sysutils/py-supervisor to 3.0a12 Message-ID: <201201101009.q0AA9tea064372@red.freebsd.org> Resent-Message-ID: <201201101010.q0AAACpe049571@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163982 >Category: ports >Synopsis: [MANTAINER UPDATE] sysutils/py-supervisor to 3.0a12 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jan 10 10:10:12 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Ildar Hizbulin >Release: 7.4-RELEASE >Organization: Ariadna-Link, ISP >Environment: FreeBSD suko74.vyborg.ru 7.4-RELEASE FreeBSD 7.4-RELEASE #0: Fri Feb 18 01:55:22 UTC 2011 root@driscoll.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: - The pid command in supervisorctl can now be used to retrieve the PIDs of child processes. See help pid. Patch by Gregory Wisniewski. - Added a new host_node_name expansion that will be expanded to the value returned by Python's platform.node (see http://docs.python.org/library/platform.html#platform.node). Patch by Joseph Kondel. - Fixed a bug in the web interface where pages over 64K would be truncated. Thanks to Drew Perttula and Timothy Jones for reporting this. - Renamed README.txt to README.rst so GitHub renders the file as ReStructuredText. - The XML-RPC server is now compatible with clients that do not send empty <params> when there are no parameters for the method call. Thanks to Johannes Becker for reporting this. - Fixed supervisorctl --help output to show the correct program name. - The behavior of the configuration options minfds and minprocs has changed. Previously, if a hard limit was less than minfds or minprocs, supervisord would unconditionally abort with an error. Now, supervisord will attempt to raise the hard limit. This may succeed if supervisord is run as root, otherwise the error is printed as before. Patch by Benoit Sigoure. - Add a boolean program option killasgroup, defaulting to false, if true when resorting to send SIGKILL to stop/terminate the process send it to its whole process group instead to take care of possible children as well and not leave them behind. Patch by Samuele Pedroni. - Environment variables may now be used in the configuration file for options that support string expansion. Patch by GitHub user "silver-". - Fixed a race condition where supervisord might not act on a signal sent to it. Thanks to Adar Dembo for reporting the issue and supplying the initial patch. - Updated the output of echo_supervisord_conf to fix typos and improve comments. Thanks to Jens Rantil for noticing these. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN py-supervisor.old/Makefile py-supervisor/Makefile --- py-supervisor.old/Makefile 2012-01-10 12:51:31.000000000 +0300 +++ py-supervisor/Makefile 2012-01-10 14:00:56.000000000 +0300 @@ -6,8 +6,7 @@ # PORTNAME= supervisor -PORTVERSION= 3.0a10 -PORTREVISION= 1 +PORTVERSION= 3.0a12 CATEGORIES= sysutils python MASTER_SITES= http://dist.supervisord.org/ \ CHEESESHOP @@ -18,6 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meld3>=0.6.4:${PORTSDIR}/www/py-meld3 +PORTDOCS= *.txt *.rst + USE_PYTHON= 2.5-2.7 USE_PYDISTUTILS= easy_install PIDDIR?= /var/run/supervisor @@ -28,11 +29,17 @@ USE_RC_SUBR= supervisord post-patch: - ${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/src/supervisor/options.py + @${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/supervisor/options.py post-install: [ -d ${PIDDIR} ] || ${MKDIR} ${PIDDIR} ${INSTALL_DATA} ${FILESDIR}/supervisord.conf.sample ${PREFIX}/etc [ -f ${PREFIX}/etc/supervisord.conf ] || ${CP} -p ${PREFIX}/etc/supervisord.conf.sample ${PREFIX}/etc/supervisord.conf +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for i in ${PORTDOCS} + @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/ +.endfor +.endif .include <bsd.port.mk> diff -ruN py-supervisor.old/distinfo py-supervisor/distinfo --- py-supervisor.old/distinfo 2012-01-10 12:51:31.000000000 +0300 +++ py-supervisor/distinfo 2012-01-10 12:53:22.000000000 +0300 @@ -1,2 +1,2 @@ -SHA256 (supervisor-3.0a10.tar.gz) = 63620d0431bafff6f346fb4df5d9a7745588b5dee1ca5fec2ddff2298107d69f -SIZE (supervisor-3.0a10.tar.gz) = 438362 +SHA256 (supervisor-3.0a12.tar.gz) = de60eee3c460b379aa8493083b59d31b29f2c4267730db29b6f9dea22642b3b4 +SIZE (supervisor-3.0a12.tar.gz) = 438901 diff -ruN py-supervisor.old/files/patch-src-supervisor-options.py py-supervisor/files/patch-src-supervisor-options.py --- py-supervisor.old/files/patch-src-supervisor-options.py 2012-01-10 12:51:31.000000000 +0300 +++ py-supervisor/files/patch-src-supervisor-options.py 1970-01-01 03:00:00.000000000 +0300 @@ -1,14 +0,0 @@ ---- src/supervisor/options.py.orig 2010-08-14 02:34:50.000000000 +0800 -+++ src/supervisor/options.py 2010-11-23 02:33:20.000000000 +0800 -@@ -105,10 +105,7 @@ - def default_configfile(self): - """Return the name of the found config file or raise. """ - here = os.path.dirname(os.path.dirname(sys.argv[0])) -- paths = [os.path.join(here, 'etc', 'supervisord.conf'), -- os.path.join(here, 'supervisord.conf'), -- 'supervisord.conf', 'etc/supervisord.conf', -- '/etc/supervisord.conf'] -+ paths = [ '%%PREFIX%%/etc/supervisord.conf' ] - config = None - for path in paths: - if os.path.exists(path): diff -ruN py-supervisor.old/files/patch-supervisor-options.py py-supervisor/files/patch-supervisor-options.py --- py-supervisor.old/files/patch-supervisor-options.py 1970-01-01 03:00:00.000000000 +0300 +++ py-supervisor/files/patch-supervisor-options.py 2012-01-10 13:00:09.000000000 +0300 @@ -0,0 +1,14 @@ +--- supervisor/options.py.orig 2012-01-10 12:55:20.000000000 +0300 ++++ supervisor/options.py 2012-01-10 12:56:14.000000000 +0300 +@@ -92,10 +92,7 @@ + def default_configfile(self): + """Return the name of the found config file or raise. """ + here = os.path.dirname(os.path.dirname(sys.argv[0])) +- paths = [os.path.join(here, 'etc', 'supervisord.conf'), +- os.path.join(here, 'supervisord.conf'), +- 'supervisord.conf', 'etc/supervisord.conf', +- '/etc/supervisord.conf'] ++ paths = [ '%%PREFIX%%/etc/supervisord.conf' ] + config = None + for path in paths: + if os.path.exists(path): diff -ruN py-supervisor.old/pkg-plist py-supervisor/pkg-plist --- py-supervisor.old/pkg-plist 2012-01-10 12:51:31.000000000 +0300 +++ py-supervisor/pkg-plist 2012-01-10 13:26:48.000000000 +0300 @@ -12,11 +12,6 @@ %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc/CHANGES.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc/COPYRIGHT.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc/LICENSES.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc/README.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc/TODO.txt %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/__init__.py %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/__init__.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/__init__.pyo @@ -353,7 +348,6 @@ @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/medusa/debian @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/medusa @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/doc @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% @stopdaemon supervisord >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201101009.q0AA9tea064372>