diff options
Diffstat (limited to 'sysutils/salt')
-rw-r--r-- | sysutils/salt/Makefile | 39 | ||||
-rw-r--r-- | sysutils/salt/PLIST | 5 | ||||
-rw-r--r-- | sysutils/salt/distinfo | 11 | ||||
-rw-r--r-- | sysutils/salt/patches/patch-salt_version.py | 15 |
4 files changed, 44 insertions, 26 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index f9ab2d5341e..7a0d3655941 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.56 2018/01/21 13:28:07 bsiegert Exp $ +# $NetBSD: Makefile,v 1.57 2018/02/07 11:11:23 adam Exp $ -DISTNAME= salt-2017.7.2 -PKGREVISION= 1 +DISTNAME= salt-2017.7.3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} @@ -17,7 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml DEPENDS+= ${PYPKGPREFIX}-requests>=2.5.0:../../devel/py-requests DEPENDS+= ${PYPKGPREFIX}-tornado>=4.3:../../www/py-tornado # zeromq transport requirements -DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto +DEPENDS+= ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq .include "../../lang/python/pyversion.mk" @@ -56,22 +55,22 @@ OWN_DIRS+= ${VARBASE}/salt/master-roots OWN_DIRS+= ${VARBASE}/cache/salt ${VARBASE}/run/salt OWN_DIRS+= ${VARBASE}/log/salt -SUBST_CLASSES+= fix-paths -SUBST_STAGE.fix-paths= pre-configure -SUBST_MESSAGE.fix-paths=Fixing hardcoded paths -SUBST_FILES.fix-paths= conf/* -SUBST_FILES.fix-paths+= doc/man/* salt/modules/munin.py setup.py -SUBST_FILES.fix-paths+= salt/utils/rsax931.py salt/grains/core.py -SUBST_SED.fix-paths= -e 's,/etc/salt,${PKG_SYSCONFDIR},g' -SUBST_SED.fix-paths+= -e 's,/srv/salt,${VARBASE}/salt/file-roots,g' -SUBST_SED.fix-paths+= -e 's,/srv/pillar,${VARBASE}/salt/pillar-roots,g' -SUBST_SED.fix-paths+= -e 's,/etc/munin,${PKG_SYSCONFBASEDIR}/munin,g' -SUBST_SED.fix-paths+= -e 's,share/man,${PKGMANDIR},g' -SUBST_SED.fix-paths+= -e 's,/opt/local/lib,${PREFIX}/lib,g' -SUBST_SED.fix-paths+= -e 's,/opt/local/etc,${PKG_SYSCONFBASEDIR},g' -SUBST_SED.fix-paths+= -e 's,/var/run,${VARBASE}/run,g' -SUBST_SED.fix-paths+= -e 's,/var/cache,${VARBASE}/cache,g' -SUBST_SED.fix-paths+= -e 's,/var/log,${VARBASE}/log,g' +SUBST_CLASSES+= fix-path +SUBST_STAGE.fix-path= pre-configure +SUBST_MESSAGE.fix-path= Fixing hardcoded paths +SUBST_FILES.fix-path= conf/* +SUBST_FILES.fix-path+= doc/man/* salt/modules/munin.py setup.py +SUBST_FILES.fix-path+= salt/utils/rsax931.py salt/grains/core.py +SUBST_SED.fix-path= -e 's,/etc/salt,${PKG_SYSCONFDIR},g' +SUBST_SED.fix-path+= -e 's,/srv/salt,${VARBASE}/salt/file-roots,g' +SUBST_SED.fix-path+= -e 's,/srv/pillar,${VARBASE}/salt/pillar-roots,g' +SUBST_SED.fix-path+= -e 's,/etc/munin,${PKG_SYSCONFBASEDIR}/munin,g' +SUBST_SED.fix-path+= -e 's,share/man,${PKGMANDIR},g' +SUBST_SED.fix-path+= -e 's,/opt/local/lib,${PREFIX}/lib,g' +SUBST_SED.fix-path+= -e 's,/opt/local/etc,${PKG_SYSCONFBASEDIR},g' +SUBST_SED.fix-path+= -e 's,/var/run,${VARBASE}/run,g' +SUBST_SED.fix-path+= -e 's,/var/cache,${VARBASE}/cache,g' +SUBST_SED.fix-path+= -e 's,/var/log,${VARBASE}/log,g' post-install: diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST index f7353a89082..0ccaedb26dd 100644 --- a/sysutils/salt/PLIST +++ b/sysutils/salt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2017/08/01 12:09:57 sborrill Exp $ +@comment $NetBSD: PLIST,v 1.23 2018/02/07 11:11:23 adam Exp $ bin/salt bin/salt-api bin/salt-call @@ -533,6 +533,9 @@ ${PYSITELIB}/salt/executors/sudo.pyo ${PYSITELIB}/salt/ext/__init__.py ${PYSITELIB}/salt/ext/__init__.pyc ${PYSITELIB}/salt/ext/__init__.pyo +${PYSITELIB}/salt/ext/backports_abc.py +${PYSITELIB}/salt/ext/backports_abc.pyc +${PYSITELIB}/salt/ext/backports_abc.pyo ${PYSITELIB}/salt/ext/ipaddress.py ${PYSITELIB}/salt/ext/ipaddress.pyc ${PYSITELIB}/salt/ext/ipaddress.pyo diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo index 5e0b57ea00e..9993cbcf8b5 100644 --- a/sysutils/salt/distinfo +++ b/sysutils/salt/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.31 2017/10/11 09:40:28 sborrill Exp $ +$NetBSD: distinfo,v 1.32 2018/02/07 11:11:23 adam Exp $ -SHA1 (salt-2017.7.2.tar.gz) = c0e7db44328e5400b17c8cd15033991855c6fe2e -RMD160 (salt-2017.7.2.tar.gz) = 1030d0e9fcd2de0ffe4604b550135413faab9fe9 -SHA512 (salt-2017.7.2.tar.gz) = 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b -Size (salt-2017.7.2.tar.gz) = 11471191 bytes +SHA1 (salt-2017.7.3.tar.gz) = b573b6f5dd8204481e69302f559a90cd93e17fba +RMD160 (salt-2017.7.3.tar.gz) = 00af188230fa05148e408659968b276f5fcf0610 +SHA512 (salt-2017.7.3.tar.gz) = 0452ad6cf2a9bcecd0056f0a6f4871e36bf2abe8c207c93f79e1e9ace608b7ba2158e958a71121f230969ff0b32ffd26f048e369003f844eaf3f4f9dd4b4a19a +Size (salt-2017.7.3.tar.gz) = 36461646 bytes +SHA1 (patch-salt_version.py) = 1827dac3609a938fae38ee5dfd2a873c9723dfbd diff --git a/sysutils/salt/patches/patch-salt_version.py b/sysutils/salt/patches/patch-salt_version.py new file mode 100644 index 00000000000..608f50704bf --- /dev/null +++ b/sysutils/salt/patches/patch-salt_version.py @@ -0,0 +1,15 @@ +$NetBSD: patch-salt_version.py,v 1.1 2018/02/07 11:11:23 adam Exp $ + +Correctly detect py-cryptodome (the drop-in replacement for py-crypto). + +--- salt/version.py.orig 2018-02-07 10:27:26.000000000 +0000 ++++ salt/version.py +@@ -581,7 +581,7 @@ def dependency_information(include_salt_ + ('msgpack-python', 'msgpack', 'version'), + ('msgpack-pure', 'msgpack_pure', 'version'), + ('pycrypto', 'Crypto', '__version__'), +- ('pycryptodome', 'Cryptodome', 'version_info'), ++ ('pycryptodome', 'Crypto', 'version_info'), + ('libnacl', 'libnacl', '__version__'), + ('PyYAML', 'yaml', '__version__'), + ('ioflo', 'ioflo', '__version__'), |