mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

- Update sysutils/py-salt from 0.16.4 to 0.17.1

Browse Source 
- Staging support

PR:		ports/183348
Submitted by:	Denis Generalov <gd@rambler-co.ru>
Approved by:	eadler, osa, rm (mentors, implicit), Christer Edwards <christer.edwards@gmail.com> (maintainer)
This commit is contained in:
Veniamin Gvozdikov 2013-10-29 19:11:18 +00:00
parent 077fbccf15
commit f6502a6a6c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=331981
6 changed files with 213 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sysutils/py-salt/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= salt
PORTVERSION= 0.16.4
PORTVERSION= 0.17.1
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -17,13 +17,27 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \
${PYTHON_PKGNAMEPREFIX}Jinja2>=0:${PORTSDIR}/devel/py-Jinja2 \
${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.9:${PORTSDIR}/devel/py-msgpack \
${PYTHON_PKGNAMEPREFIX}m2crypto>=0:${PORTSDIR}/security/py-m2crypto
${PYTHON_PKGNAMEPREFIX}m2crypto>=0:${PORTSDIR}/security/py-m2crypto \
sshpass>=0:${PORTSDIR}/security/sshpass
RUN_DEPENDS:= ${BUILD_DEPENDS}
FETCH_ARGS= -pRr
USE_PYTHON= -2.7
USE_PYDISTUTILS=yes
PYDISTUTILS_INSTALLARGS+=\
--prefix=${PREFIX} \
--salt-root-dir=/ \
--salt-config-dir=${ETCDIR} \
--salt-cache-dir=/var/cache/salt \
--salt-sock-dir=/var/run/salt \
--salt-srv-root-dir=${ETCDIR} \
--salt-base-file-roots-dir=${ETCDIR}/states \
--salt-base-pillar-roots-dir=${ETCDIR}/pillar \
--salt-base-master-roots-dir=${ETCDIR}/salt-master \
--salt-logs-dir=/var/log/salt \
--salt-pidfile-dir=/var/run
USE_RC_SUBR= salt_master \
salt_minion \
salt_syndic
@ -32,23 +46,11 @@ SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
SUB_FILES= pkg-message
MAN1= salt-call.1 \
salt-cp.1 \
salt-key.1 \
salt-master.1 \
salt-minion.1 \
salt-run.1 \
salt-syndic.1 \
salt.1
MAN7= salt.7
NO_STAGE= yes
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 \
doc/man/salt-call.1 salt/config.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|' \
@ -57,11 +59,9 @@ post-patch:
.endfor
post-install:
${MKDIR} ${ETCDIR}
${INSTALL_DATA} ${WRKSRC}/conf/master ${PREFIX}/etc/salt/master.sample
${INSTALL_DATA} ${WRKSRC}/conf/minion ${PREFIX}/etc/salt/minion.sample
@${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/doc/man/,} ${MANPREFIX}/man/man1/
@${INSTALL_MAN} ${WRKSRC}/doc/man/${MAN7} ${MANPREFIX}/man/man7/
${MKDIR} ${STAGEDIR}${ETCDIR}
${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>

4
sysutils/py-salt/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (salt-0.16.4.tar.gz) = aa880a7008995be88e417e3639ff9326c3df73650fe3155a7dec43a3b1cb498d
SIZE (salt-0.16.4.tar.gz) = 3542126
SHA256 (salt-0.17.1.tar.gz) = 2f9f0e8b2ed53241ab3e373fd8d4030384b3f78f7b796d185c9907874cceebb9
SIZE (salt-0.17.1.tar.gz) = 3800422

6
sysutils/py-salt/files/patch-salt__grains__core.py
View File

@ -1,6 +1,6 @@
--- ./salt/grains/core.py.orig 2013-05-29 00:22:30.000000000 -0600
+++ ./salt/grains/core.py 2013-05-31 10:09:03.273791365 -0600
@@ -791,7 +791,7 @@
--- ./salt/grains/core.py.orig 2013-10-17 08:48:57.000000000 +0400
+++ ./salt/grains/core.py 2013-10-25 10:46:21.000000000 +0400
@@ -1059,7 +1059,7 @@
'''
# Provides:
# path

16
sysutils/py-salt/files/patch-salt__utils____init__.py
View File

@ -1,8 +1,8 @@
--- salt/utils/__init__.py.orig 2013-05-29 00:20:55.000000000 -0600
+++ salt/utils/__init__.py 2013-05-31 10:13:41.486795573 -0600
@@ -242,6 +242,15 @@
default_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin'
search_path = os.environ.get('PATH', default_path)
--- ./salt/utils/__init__.py.orig 2013-10-17 21:27:29.000000000 +0400
+++ ./salt/utils/__init__.py 2013-10-25 10:52:19.000000000 +0400
@@ -266,6 +266,15 @@
if os.access(exe, os.X_OK):
return exe
+ p = os.environ.get('PATH')
+ if p is not None:
@ -13,6 +13,6 @@
+ pp.append('/usr/local/sbin')
+ os.environ['PATH'] = os.pathsep.join(pp)
+
for path in search_path.split(os.pathsep):
full_path = os.path.join(path, exe)
if os.access(full_path, os.X_OK):
# default path based on busybox's default
default_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin'
search_path = os.environ.get('PATH', default_path)

23
sysutils/py-salt/files/patch-setup.py
View File

@ -1,16 +1,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')
with open(salt_reqs) as f:
lines = f.read().split('\n')
@@ -209,7 +209,7 @@
'salt.utils',
--- ./setup.py.orig 2013-10-17 21:27:29.000000000 +0400
+++ ./setup.py 2013-10-25 10:43:51.000000000 +0400
@@ -313,7 +313,7 @@
'salt.log.handlers',
],
'package_data': {'salt.modules': ['rh_ip/*.jinja']},
- 'data_files': [('share/man/man1',
@ -18,12 +9,12 @@
['doc/man/salt-master.1',
'doc/man/salt-key.1',
'doc/man/salt.1',
@@ -219,7 +219,7 @@
'doc/man/salt-run.1',
@@ -324,7 +324,7 @@
'doc/man/salt-ssh.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,
'install_requires': REQUIREMENTS,

541
sysutils/py-salt/pkg-plist
View File

File diff suppressed because it is too large Load Diff