Date: Wed, 20 Mar 2013 16:30:55 GMT From: Denis Generalov <gd@rambler-co.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/177144: [PATCH] sysutils/py-salt: update to 0.13.3 Message-ID: <201303201630.r2KGUt5k007937@red.freebsd.org> Resent-Message-ID: <201303201640.r2KGe17j037380@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177144 >Category: ports >Synopsis: [PATCH] sysutils/py-salt: update to 0.13.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Mar 20 16:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Denis Generalov >Release: FreeBSD 9.1-STABLE amd64 >Organization: Rambler >Environment: FreeBSD tyl.rambler.ramblermedia.com 9.1-STABLE FreeBSD 9.1-STABLE #0 r244924: Tue Jan 1 21:05:19 MSK 2013 gd@tyl.rambler.ramblermedia.com:/tmp/gd/usr/src/sys/GENERIC amd64 >Description: * Update sysutils/py-salt from 0.13.2 to 0.13.3 * fix pillar path * fix ports/176489 PR >How-To-Repeat: >Fix: Patch attached with submission follows: ===> Generating patch ===> Viewing diff with more diff -ruN /usr/ports//sysutils/py-salt/Makefile ./Makefile --- /usr/ports//sysutils/py-salt/Makefile 2013-03-14 16:15:39.000000000 +0400 +++ ./Makefile 2013-03-20 20:08:53.000000000 +0400 @@ -2,7 +2,7 @@ # $FreeBSD: head/sysutils/py-salt/Makefile 314140 2013-03-14 08:15:46Z culot $ PORTNAME= salt -PORTVERSION= 0.13.2 +PORTVERSION= 0.13.3 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -51,7 +51,8 @@ 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: diff -ruN /usr/ports//sysutils/py-salt/distinfo ./distinfo --- /usr/ports//sysutils/py-salt/distinfo 2013-03-14 16:15:39.000000000 +0400 +++ ./distinfo 2013-03-20 17:36:12.000000000 +0400 @@ -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 diff -ruN /usr/ports//sysutils/py-salt/files/patch-salt__grains__core.py ./files/patch-salt__grains__core.py --- /usr/ports//sysutils/py-salt/files/patch-salt__grains__core.py 1970-01-01 03:00:00.000000000 +0300 +++ ./files/patch-salt__grains__core.py 2013-03-20 20:22:44.000000000 +0400 @@ -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(): diff -ruN /usr/ports//sysutils/py-salt/files/patch-salt__utils____init__.py ./files/patch-salt__utils____init__.py --- /usr/ports//sysutils/py-salt/files/patch-salt__utils____init__.py 1970-01-01 03:00:00.000000000 +0300 +++ ./files/patch-salt__utils____init__.py 2013-03-20 20:22:44.000000000 +0400 @@ -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): diff -ruN /usr/ports//sysutils/py-salt/files/patch-setup.py ./files/patch-setup.py --- /usr/ports//sysutils/py-salt/files/patch-setup.py 2013-01-28 01:44:29.000000000 +0400 +++ ./files/patch-setup.py 2013-03-20 20:22:44.000000000 +0400 @@ -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 ===> Done >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303201630.r2KGUt5k007937>