Date: Sat, 23 Mar 2013 06:04:41 +0000 (UTC) From: Ruslan Mahmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314999 - in head/sysutils/py-salt: . files Message-ID: <201303230604.r2N64f85005993@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Sat Mar 23 06:04:41 2013 New Revision: 314999 URL: http://svnweb.freebsd.org/changeset/ports/314999 Log: - update to 0.13.3 - fix pillar path - fix problem, mentioned in ports/176489 PR: 177144 Submitted by: Denis Generalov <gd@rambler-co.ru> Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer) Added: head/sysutils/py-salt/files/patch-salt__grains__core.py (contents, props changed) head/sysutils/py-salt/files/patch-salt__utils____init__.py (contents, props changed) Modified: head/sysutils/py-salt/Makefile head/sysutils/py-salt/distinfo head/sysutils/py-salt/files/patch-setup.py Modified: head/sysutils/py-salt/Makefile ============================================================================== --- head/sysutils/py-salt/Makefile Sat Mar 23 06:00:49 2013 (r314998) +++ head/sysutils/py-salt/Makefile Sat Mar 23 06:04:41 2013 (r314999) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 0.13.2 +PORTVERSION= 0.13.3 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -45,13 +45,14 @@ MAN7= salt.7 post-patch: .for file in conf/minion conf/master doc/man/salt-key.1 \ - doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \ - doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \ - doc/man/salt-call.1 salt/config.py salt/client.py \ - salt/modules/mysql.py salt/utils/parsers.py salt/modules/tls.py \ - salt/modules/postgres.py salt/utils/migrations.py + doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \ + doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \ + doc/man/salt-call.1 salt/config.py salt/client.py \ + salt/modules/mysql.py salt/utils/parsers.py salt/modules/tls.py \ + salt/modules/postgres.py salt/utils/migrations.py @${REINPLACE_CMD} -e 's|/etc/salt|${PREFIX}/etc/salt|' \ - -e 's|/srv/salt|${PREFIX}/etc/salt/states|' ${WRKSRC}/${file} + -e 's|/srv/salt|${PREFIX}/etc/salt/states|' \ + -e 's|/srv/pillar|${PREFIX}/etc/salt/pillar|' ${WRKSRC}/${file} .endfor post-install: Modified: head/sysutils/py-salt/distinfo ============================================================================== --- head/sysutils/py-salt/distinfo Sat Mar 23 06:00:49 2013 (r314998) +++ head/sysutils/py-salt/distinfo Sat Mar 23 06:04:41 2013 (r314999) @@ -1,2 +1,2 @@ -SHA256 (salt-0.13.2.tar.gz) = 6b31de87e75c7fe48aaa752dae5fa8e8d9ebfcbd8c7ed101c25633bfd328d3a5 -SIZE (salt-0.13.2.tar.gz) = 1020584 +SHA256 (salt-0.13.3.tar.gz) = c0281cd1549356d38f67492b741225d6ba3d9b3dc01addfdadf07867078e460b +SIZE (salt-0.13.3.tar.gz) = 1019952 Added: head/sysutils/py-salt/files/patch-salt__grains__core.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-salt/files/patch-salt__grains__core.py Sat Mar 23 06:04:41 2013 (r314999) @@ -0,0 +1,11 @@ +--- ./salt/grains/core.py.orig 2013-03-19 09:30:55.000000000 +0400 ++++ ./salt/grains/core.py 2013-03-20 20:15:36.000000000 +0400 +@@ -730,7 +730,7 @@ + ''' + # Provides: + # path +- return {'path': os.environ['PATH'].strip()} ++ return {'path': os.environ['PATH'].strip() + ':/usr/local/bin:/usr/local/sbin'} + + + def pythonversion(): Added: head/sysutils/py-salt/files/patch-salt__utils____init__.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-salt/files/patch-salt__utils____init__.py Sat Mar 23 06:04:41 2013 (r314999) @@ -0,0 +1,18 @@ +--- ./salt/utils/__init__.py.orig 2013-03-19 09:30:55.000000000 +0400 ++++ ./salt/utils/__init__.py 2013-03-20 20:22:28.000000000 +0400 +@@ -228,6 +228,15 @@ + # default path based on busybox's default + default_path = "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin" + ++ p = os.environ.get('PATH') ++ if p is not None: ++ pp = p.split(os.pathsep) ++ if '/usr/local/bin' not in pp: ++ pp.append('/usr/local/bin') ++ if '/usr/local/sbin' not in pp: ++ pp.append('/usr/local/sbin') ++ os.environ['PATH'] = os.pathsep.join(pp) ++ + for path in os.environ.get('PATH', default_path).split(os.pathsep): + full_path = os.path.join(path, exe) + if os.access(full_path, os.X_OK): Modified: head/sysutils/py-salt/files/patch-setup.py ============================================================================== --- head/sysutils/py-salt/files/patch-setup.py Sat Mar 23 06:00:49 2013 (r314998) +++ head/sysutils/py-salt/files/patch-setup.py Sat Mar 23 06:04:41 2013 (r314999) @@ -1,15 +1,15 @@ ---- ./setup.py.orig 2012-10-24 04:51:35.000000000 +0400 -+++ ./setup.py 2012-10-24 16:30:49.000000000 +0400 -@@ -93,7 +93,7 @@ +--- ./setup.py.orig 2013-03-19 08:58:34.000000000 +0400 ++++ ./setup.py 2013-03-20 20:15:36.000000000 +0400 +@@ -156,7 +156,7 @@ if 'SYSCONFDIR' in os.environ: etc_path = os.environ['SYSCONFDIR'] else: - etc_path = os.path.join(os.path.dirname(PREFIX), 'etc') + etc_path = os.path.join('%%PREFIX%%', 'etc') - libraries = ['ws2_32'] if sys.platform == 'win32' else [] - -@@ -139,7 +139,7 @@ + with open(salt_reqs) as f: + lines = f.read().split('\n') +@@ -209,7 +209,7 @@ 'salt.utils', ], 'package_data': {'salt.modules': ['rh_ip/*.jinja']}, @@ -18,12 +18,12 @@ ['doc/man/salt-master.1', 'doc/man/salt-key.1', 'doc/man/salt.1', -@@ -149,7 +149,7 @@ +@@ -219,7 +219,7 @@ 'doc/man/salt-run.1', 'doc/man/salt-minion.1', ]), - ('share/man/man7', ['doc/man/salt.7']), + ('man/man7', ['doc/man/salt.7']), ], + # Required for esky builds 'install_requires': requirements, - # The dynamic module loading in salt.modules makes this
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303230604.r2N64f85005993>