Date: Thu, 8 Aug 2013 10:03:25 GMT From: Ildar Hizbulin <hizel@vyborg.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181138: [MAINTAINER UPDATE] sysutils/py-supervisor Message-ID: <201308081003.r78A3P6r021161@oldred.freebsd.org> Resent-Message-ID: <201308081010.r78AA0Sv044889@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181138
>Category: ports
>Synopsis: [MAINTAINER UPDATE] sysutils/py-supervisor
>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: Thu Aug 08 10:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Ildar Hizbulin
>Release: 9.1-RELEASE
>Organization:
Ildar Hizbulin
>Environment:
FreeBSD tst9-64 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r245720: Mon Jan 21 13:14:57 MSK 2013 root@tst9-64:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
supervisor 3.0 release
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN sysutils/py-supervisor.old/Makefile sysutils/py-supervisor/Makefile
--- sysutils/py-supervisor.old/Makefile 2013-08-08 10:58:20.000000000 +0400
+++ sysutils/py-supervisor/Makefile 2013-08-08 13:33:51.000000000 +0400
@@ -2,7 +2,7 @@
# $FreeBSD: ports/sysutils/py-supervisor/Makefile,v 1.9 2012/11/17 06:01:43 svnexp Exp $
PORTNAME= supervisor
-PORTVERSION= 3.0b1
+PORTVERSION= 3.0
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff -ruN sysutils/py-supervisor.old/distinfo sysutils/py-supervisor/distinfo
--- sysutils/py-supervisor.old/distinfo 2013-08-08 10:58:20.000000000 +0400
+++ sysutils/py-supervisor/distinfo 2013-08-08 10:59:11.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (supervisor-3.0b1.tar.gz) = 7361e224871257534cac3bc035e90571c35b9fa9245ec46207de9d89191a7d0c
-SIZE (supervisor-3.0b1.tar.gz) = 452676
+SHA256 (supervisor-3.0.tar.gz) = 82aac54c5760b6a4f4c28dda203714e362a68b4a9ba8549fa65955998e3a2212
+SIZE (supervisor-3.0.tar.gz) = 459820
diff -ruN sysutils/py-supervisor.old/files/patch-supervisor-tests-test_childutils.py sysutils/py-supervisor/files/patch-supervisor-tests-test_childutils.py
--- sysutils/py-supervisor.old/files/patch-supervisor-tests-test_childutils.py 2013-08-08 10:58:20.000000000 +0400
+++ sysutils/py-supervisor/files/patch-supervisor-tests-test_childutils.py 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- supervisor/tests/test_childutils.py
-+++ supervisor/tests/test_childutils.py
-@@ -41,7 +41,7 @@ class ChildUtilsTests(unittest.TestCase):
-
- def test_get_asctime(self):
- from supervisor.childutils import get_asctime
-- timestamp = time.mktime((2009, 1, 18, 22, 14, 7, 0, 0, 0))
-+ timestamp = time.mktime((2009, 1, 18, 22, 14, 7, 0, 0, -1))
- result = get_asctime(timestamp)
- self.assertEqual(result, '2009-01-18 22:14:07,000')
-
diff -ruN sysutils/py-supervisor.old/files/patch-supervisor_options.py sysutils/py-supervisor/files/patch-supervisor_options.py
--- sysutils/py-supervisor.old/files/patch-supervisor_options.py 2013-08-08 10:58:20.000000000 +0400
+++ sysutils/py-supervisor/files/patch-supervisor_options.py 2013-08-08 11:04:45.000000000 +0400
@@ -1,14 +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. """
+--- supervisor/options.py~ 2013-08-08 11:02:05.000000000 +0400
++++ supervisor/options.py 2013-08-08 11:04:17.000000000 +0400
+@@ -99,10 +99,7 @@
+ self.add("configfile", None, "c:", "configuration=")
+
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):
+- searchpaths = [os.path.join(here, 'etc', 'supervisord.conf'),
+- os.path.join(here, 'supervisord.conf'),
+- 'supervisord.conf', 'etc/supervisord.conf',
+- '/etc/supervisord.conf']
++ searchpaths = [ '%%PREFIX%%/etc/supervisord.conf' ]
+ self.searchpaths = searchpaths
+
+ def default_configfile(self):
diff -ruN sysutils/py-supervisor.old/pkg-plist sysutils/py-supervisor/pkg-plist
--- sysutils/py-supervisor.old/pkg-plist 2013-08-08 10:58:20.000000000 +0400
+++ sysutils/py-supervisor/pkg-plist 2013-08-08 13:53:06.000000000 +0400
@@ -318,6 +318,7 @@
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/button_refresh.gif
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/button_restart.gif
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/button_stop.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/icon.png
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/rule.gif
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/state0.gif
%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/supervisor/ui/images/state1.gif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308081003.r78A3P6r021161>