pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils
Module Name: pkgsrc
Committed By: adam
Date: Mon Oct 31 17:32:46 UTC 2022
Modified Files:
pkgsrc/sysutils/salt: Makefile PLIST distinfo
pkgsrc/sysutils/salt-docs: Makefile
Added Files:
pkgsrc/sysutils/salt: Makefile.common
pkgsrc/sysutils/salt/patches: patch-requirements_base.txt
patch-salt_utils_rsax931.py
Removed Files:
pkgsrc/sysutils/salt-docs: distinfo
Log Message:
salt salt-docs: updated to 3005.1
3005.1
FIXED
Fix arch parsing issue in apt source files
Fixed parsing CDROM apt sources
Use str() method instead of repo_line for when python3-apt is installed or not in aptpkg.py.
Remove the connection_timeout from netmiko_connection_args before netmiko_connection_args is added to __context__["netmiko_device"]["args"] which is passed along to the Netmiko library.
fixes #62553 by checking for disabled master_type before starting master connection and skipping it if set.
Fix runas with cmd module when using the onedir bundled packages
Fix the Pyinstaller hooks to preserve the environment if None is passed.
pkgrepo.managed sets wrong permissions on keys installed to /etc/apt/keyring
pkgrepo.managed creates zero byte gpg files when dearmoring contents to the same filename
Ensure default values for IPC Buffers are correct type
Fix a hang on salt-ssh when using sudo.
Renderers now have access to the correct set of salt functions.
Fix including Jinja template from absolute path
include jmespath in package requirements
Fix pkgrepo.managed signed-by in test=true mode
Ensure the status of the service is captured when the beacon function is called, even when the event is not being emitted.
The sub proxies controlled by Deltaproxy need to have their own req_channel otherwise there are timeout exceptions when the __master_req_channel_payload is fired and reacted on.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/sysutils/salt/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/salt/Makefile.common
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/salt/PLIST
cvs rdiff -u -r1.45 -r1.46 pkgsrc/sysutils/salt/distinfo
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/salt-docs/Makefile
cvs rdiff -u -r1.15 -r0 pkgsrc/sysutils/salt-docs/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/salt/patches/patch-requirements_base.txt \
pkgsrc/sysutils/salt/patches/patch-salt_utils_rsax931.py
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/salt/Makefile
diff -u pkgsrc/sysutils/salt/Makefile:1.80 pkgsrc/sysutils/salt/Makefile:1.81
--- pkgsrc/sysutils/salt/Makefile:1.80 Fri Sep 30 10:02:12 2022
+++ pkgsrc/sysutils/salt/Makefile Mon Oct 31 17:32:46 2022
@@ -1,18 +1,13 @@
-# $NetBSD: Makefile,v 1.80 2022/09/30 10:02:12 sborrill Exp $
+# $NetBSD: Makefile,v 1.81 2022/10/31 17:32:46 adam Exp $
-DISTNAME= salt-3004
-PKGREVISION= 3
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/}
+.include "Makefile.common"
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://saltproject.io/
COMMENT= Remote execution and configuration management system
-LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-cryptodome>=3.9.8:../../security/py-cryptodome
DEPENDS+= ${PYPKGPREFIX}-distro>=1.0.1:../../devel/py-distro
DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
+DEPENDS+= ${PYPKGPREFIX}-jmespath-[0-9]*:../../textproc/py-jmespath
DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe
DEPENDS+= ${PYPKGPREFIX}-msgpack>=0.5.6:../../devel/py-msgpack
DEPENDS+= ${PYPKGPREFIX}-psutil>=5.0.0:../../sysutils/py-psutil
@@ -20,8 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-requests>=2.5.0
DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
DEPENDS+= ${PYPKGPREFIX}-zmq>=19.0.2:../../net/py-zmq
-PYTHON_VERSIONS_INCOMPATIBLE= 27
-
USE_PKG_RESOURCES= yes
BUILD_DEFS+= VARBASE
Index: pkgsrc/sysutils/salt/PLIST
diff -u pkgsrc/sysutils/salt/PLIST:1.30 pkgsrc/sysutils/salt/PLIST:1.31
--- pkgsrc/sysutils/salt/PLIST:1.30 Sun Nov 14 20:01:17 2021
+++ pkgsrc/sysutils/salt/PLIST Mon Oct 31 17:32:46 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2021/11/14 20:01:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.31 2022/10/31 17:32:46 adam Exp $
bin/salt
bin/salt-api
bin/salt-call
@@ -11,7 +11,6 @@ bin/salt-proxy
bin/salt-run
bin/salt-ssh
bin/salt-syndic
-bin/salt-unity
bin/spm
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -206,6 +205,15 @@ ${PYSITELIB}/salt/cache/mysql_cache.pyo
${PYSITELIB}/salt/cache/redis_cache.py
${PYSITELIB}/salt/cache/redis_cache.pyc
${PYSITELIB}/salt/cache/redis_cache.pyo
+${PYSITELIB}/salt/channel/__init__.py
+${PYSITELIB}/salt/channel/__init__.pyc
+${PYSITELIB}/salt/channel/__init__.pyo
+${PYSITELIB}/salt/channel/client.py
+${PYSITELIB}/salt/channel/client.pyc
+${PYSITELIB}/salt/channel/client.pyo
+${PYSITELIB}/salt/channel/server.py
+${PYSITELIB}/salt/channel/server.pyc
+${PYSITELIB}/salt/channel/server.pyo
${PYSITELIB}/salt/cli/__init__.py
${PYSITELIB}/salt/cli/__init__.pyc
${PYSITELIB}/salt/cli/__init__.pyo
@@ -918,6 +926,9 @@ ${PYSITELIB}/salt/grains/mdata.pyo
${PYSITELIB}/salt/grains/metadata.py
${PYSITELIB}/salt/grains/metadata.pyc
${PYSITELIB}/salt/grains/metadata.pyo
+${PYSITELIB}/salt/grains/metadata_gce.py
+${PYSITELIB}/salt/grains/metadata_gce.pyc
+${PYSITELIB}/salt/grains/metadata_gce.pyo
${PYSITELIB}/salt/grains/minion_process.py
${PYSITELIB}/salt/grains/minion_process.pyc
${PYSITELIB}/salt/grains/minion_process.pyo
@@ -972,24 +983,27 @@ ${PYSITELIB}/salt/log/__init__.pyo
${PYSITELIB}/salt/log/handlers/__init__.py
${PYSITELIB}/salt/log/handlers/__init__.pyc
${PYSITELIB}/salt/log/handlers/__init__.pyo
-${PYSITELIB}/salt/log/handlers/fluent_mod.py
-${PYSITELIB}/salt/log/handlers/fluent_mod.pyc
-${PYSITELIB}/salt/log/handlers/fluent_mod.pyo
-${PYSITELIB}/salt/log/handlers/log4mongo_mod.py
-${PYSITELIB}/salt/log/handlers/log4mongo_mod.pyc
-${PYSITELIB}/salt/log/handlers/log4mongo_mod.pyo
-${PYSITELIB}/salt/log/handlers/logstash_mod.py
-${PYSITELIB}/salt/log/handlers/logstash_mod.pyc
-${PYSITELIB}/salt/log/handlers/logstash_mod.pyo
-${PYSITELIB}/salt/log/handlers/sentry_mod.py
-${PYSITELIB}/salt/log/handlers/sentry_mod.pyc
-${PYSITELIB}/salt/log/handlers/sentry_mod.pyo
${PYSITELIB}/salt/log/mixins.py
${PYSITELIB}/salt/log/mixins.pyc
${PYSITELIB}/salt/log/mixins.pyo
${PYSITELIB}/salt/log/setup.py
${PYSITELIB}/salt/log/setup.pyc
${PYSITELIB}/salt/log/setup.pyo
+${PYSITELIB}/salt/log_handlers/__init__.py
+${PYSITELIB}/salt/log_handlers/__init__.pyc
+${PYSITELIB}/salt/log_handlers/__init__.pyo
+${PYSITELIB}/salt/log_handlers/fluent_mod.py
+${PYSITELIB}/salt/log_handlers/fluent_mod.pyc
+${PYSITELIB}/salt/log_handlers/fluent_mod.pyo
+${PYSITELIB}/salt/log_handlers/log4mongo_mod.py
+${PYSITELIB}/salt/log_handlers/log4mongo_mod.pyc
+${PYSITELIB}/salt/log_handlers/log4mongo_mod.pyo
+${PYSITELIB}/salt/log_handlers/logstash_mod.py
+${PYSITELIB}/salt/log_handlers/logstash_mod.pyc
+${PYSITELIB}/salt/log_handlers/logstash_mod.pyo
+${PYSITELIB}/salt/log_handlers/sentry_mod.py
+${PYSITELIB}/salt/log_handlers/sentry_mod.pyc
+${PYSITELIB}/salt/log_handlers/sentry_mod.pyo
${PYSITELIB}/salt/master.py
${PYSITELIB}/salt/master.pyc
${PYSITELIB}/salt/master.pyo
@@ -2193,6 +2207,9 @@ ${PYSITELIB}/salt/modules/rest_service.p
${PYSITELIB}/salt/modules/restartcheck.py
${PYSITELIB}/salt/modules/restartcheck.pyc
${PYSITELIB}/salt/modules/restartcheck.pyo
+${PYSITELIB}/salt/modules/restconf.py
+${PYSITELIB}/salt/modules/restconf.pyc
+${PYSITELIB}/salt/modules/restconf.pyo
${PYSITELIB}/salt/modules/ret.py
${PYSITELIB}/salt/modules/ret.pyc
${PYSITELIB}/salt/modules/ret.pyo
@@ -2364,6 +2381,9 @@ ${PYSITELIB}/salt/modules/supervisord.py
${PYSITELIB}/salt/modules/suse_apache.py
${PYSITELIB}/salt/modules/suse_apache.pyc
${PYSITELIB}/salt/modules/suse_apache.pyo
+${PYSITELIB}/salt/modules/suse_ip.py
+${PYSITELIB}/salt/modules/suse_ip.pyc
+${PYSITELIB}/salt/modules/suse_ip.pyo
${PYSITELIB}/salt/modules/svn.py
${PYSITELIB}/salt/modules/svn.pyc
${PYSITELIB}/salt/modules/svn.pyo
@@ -2568,6 +2588,9 @@ ${PYSITELIB}/salt/modules/win_service.py
${PYSITELIB}/salt/modules/win_shadow.py
${PYSITELIB}/salt/modules/win_shadow.pyc
${PYSITELIB}/salt/modules/win_shadow.pyo
+${PYSITELIB}/salt/modules/win_shortcut.py
+${PYSITELIB}/salt/modules/win_shortcut.pyc
+${PYSITELIB}/salt/modules/win_shortcut.pyo
${PYSITELIB}/salt/modules/win_smtp_server.py
${PYSITELIB}/salt/modules/win_smtp_server.pyc
${PYSITELIB}/salt/modules/win_smtp_server.pyo
@@ -2619,6 +2642,9 @@ ${PYSITELIB}/salt/modules/xml.pyo
${PYSITELIB}/salt/modules/xmpp.py
${PYSITELIB}/salt/modules/xmpp.pyc
${PYSITELIB}/salt/modules/xmpp.pyo
+${PYSITELIB}/salt/modules/yaml.py
+${PYSITELIB}/salt/modules/yaml.pyc
+${PYSITELIB}/salt/modules/yaml.pyo
${PYSITELIB}/salt/modules/yumpkg.py
${PYSITELIB}/salt/modules/yumpkg.pyc
${PYSITELIB}/salt/modules/yumpkg.pyo
@@ -2970,6 +2996,9 @@ ${PYSITELIB}/salt/proxy/philips_hue.pyo
${PYSITELIB}/salt/proxy/rest_sample.py
${PYSITELIB}/salt/proxy/rest_sample.pyc
${PYSITELIB}/salt/proxy/rest_sample.pyo
+${PYSITELIB}/salt/proxy/restconf.py
+${PYSITELIB}/salt/proxy/restconf.pyc
+${PYSITELIB}/salt/proxy/restconf.pyo
${PYSITELIB}/salt/proxy/ssh_sample.py
${PYSITELIB}/salt/proxy/ssh_sample.pyc
${PYSITELIB}/salt/proxy/ssh_sample.pyo
@@ -3645,6 +3674,9 @@ ${PYSITELIB}/salt/states/cmd.pyo
${PYSITELIB}/salt/states/composer.py
${PYSITELIB}/salt/states/composer.pyc
${PYSITELIB}/salt/states/composer.pyo
+${PYSITELIB}/salt/states/consul.py
+${PYSITELIB}/salt/states/consul.pyc
+${PYSITELIB}/salt/states/consul.pyo
${PYSITELIB}/salt/states/cron.py
${PYSITELIB}/salt/states/cron.pyc
${PYSITELIB}/salt/states/cron.pyo
@@ -4242,6 +4274,9 @@ ${PYSITELIB}/salt/states/redismod.pyo
${PYSITELIB}/salt/states/reg.py
${PYSITELIB}/salt/states/reg.pyc
${PYSITELIB}/salt/states/reg.pyo
+${PYSITELIB}/salt/states/restconf.py
+${PYSITELIB}/salt/states/restconf.pyc
+${PYSITELIB}/salt/states/restconf.pyo
${PYSITELIB}/salt/states/rsync.py
${PYSITELIB}/salt/states/rsync.pyc
${PYSITELIB}/salt/states/rsync.pyo
@@ -4413,6 +4448,9 @@ ${PYSITELIB}/salt/states/win_powercfg.py
${PYSITELIB}/salt/states/win_servermanager.py
${PYSITELIB}/salt/states/win_servermanager.pyc
${PYSITELIB}/salt/states/win_servermanager.pyo
+${PYSITELIB}/salt/states/win_shortcut.py
+${PYSITELIB}/salt/states/win_shortcut.pyc
+${PYSITELIB}/salt/states/win_shortcut.pyo
${PYSITELIB}/salt/states/win_smtp_server.py
${PYSITELIB}/salt/states/win_smtp_server.pyc
${PYSITELIB}/salt/states/win_smtp_server.pyo
@@ -4515,7 +4553,11 @@ ${PYSITELIB}/salt/templates/rh_ip/networ
${PYSITELIB}/salt/templates/rh_ip/rh6_route_eth.jinja
${PYSITELIB}/salt/templates/rh_ip/rh7_eth.jinja
${PYSITELIB}/salt/templates/rh_ip/rh8_eth.jinja
+${PYSITELIB}/salt/templates/rh_ip/rh9_eth.jinja
${PYSITELIB}/salt/templates/rh_ip/route_eth.jinja
+${PYSITELIB}/salt/templates/suse_ip/ifcfg.jinja
+${PYSITELIB}/salt/templates/suse_ip/ifroute.jinja
+${PYSITELIB}/salt/templates/suse_ip/network.jinja
${PYSITELIB}/salt/templates/virt/libvirt_chardevs.jinja
${PYSITELIB}/salt/templates/virt/libvirt_disks.jinja
${PYSITELIB}/salt/templates/virt/libvirt_domain.jinja
@@ -4590,6 +4632,9 @@ ${PYSITELIB}/salt/tops/varstack_top.pyo
${PYSITELIB}/salt/transport/__init__.py
${PYSITELIB}/salt/transport/__init__.pyc
${PYSITELIB}/salt/transport/__init__.pyo
+${PYSITELIB}/salt/transport/base.py
+${PYSITELIB}/salt/transport/base.pyc
+${PYSITELIB}/salt/transport/base.pyo
${PYSITELIB}/salt/transport/client.py
${PYSITELIB}/salt/transport/client.pyc
${PYSITELIB}/salt/transport/client.pyo
@@ -4602,12 +4647,6 @@ ${PYSITELIB}/salt/transport/ipc.pyo
${PYSITELIB}/salt/transport/local.py
${PYSITELIB}/salt/transport/local.pyc
${PYSITELIB}/salt/transport/local.pyo
-${PYSITELIB}/salt/transport/mixins/__init__.py
-${PYSITELIB}/salt/transport/mixins/__init__.pyc
-${PYSITELIB}/salt/transport/mixins/__init__.pyo
-${PYSITELIB}/salt/transport/mixins/auth.py
-${PYSITELIB}/salt/transport/mixins/auth.pyc
-${PYSITELIB}/salt/transport/mixins/auth.pyo
${PYSITELIB}/salt/transport/server.py
${PYSITELIB}/salt/transport/server.pyc
${PYSITELIB}/salt/transport/server.pyo
@@ -4623,6 +4662,9 @@ ${PYSITELIB}/salt/utils/__init__.pyo
${PYSITELIB}/salt/utils/aggregation.py
${PYSITELIB}/salt/utils/aggregation.pyc
${PYSITELIB}/salt/utils/aggregation.pyo
+${PYSITELIB}/salt/utils/ansible.py
+${PYSITELIB}/salt/utils/ansible.pyc
+${PYSITELIB}/salt/utils/ansible.pyo
${PYSITELIB}/salt/utils/args.py
${PYSITELIB}/salt/utils/args.pyc
${PYSITELIB}/salt/utils/args.pyo
@@ -4656,6 +4698,9 @@ ${PYSITELIB}/salt/utils/botomod.pyo
${PYSITELIB}/salt/utils/cache.py
${PYSITELIB}/salt/utils/cache.pyc
${PYSITELIB}/salt/utils/cache.pyo
+${PYSITELIB}/salt/utils/channel.py
+${PYSITELIB}/salt/utils/channel.pyc
+${PYSITELIB}/salt/utils/channel.pyo
${PYSITELIB}/salt/utils/cloud.py
${PYSITELIB}/salt/utils/cloud.pyc
${PYSITELIB}/salt/utils/cloud.pyo
@@ -4962,6 +5007,24 @@ ${PYSITELIB}/salt/utils/pycrypto.pyo
${PYSITELIB}/salt/utils/pydsl.py
${PYSITELIB}/salt/utils/pydsl.pyc
${PYSITELIB}/salt/utils/pydsl.pyo
+${PYSITELIB}/salt/utils/pyinstaller/__init__.py
+${PYSITELIB}/salt/utils/pyinstaller/__init__.pyc
+${PYSITELIB}/salt/utils/pyinstaller/__init__.pyo
+${PYSITELIB}/salt/utils/pyinstaller/hook-salt.py
+${PYSITELIB}/salt/utils/pyinstaller/hook-salt.pyc
+${PYSITELIB}/salt/utils/pyinstaller/hook-salt.pyo
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/__init__.py
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/__init__.pyc
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/__init__.pyo
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/_overrides.py
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/_overrides.pyc
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/_overrides.pyo
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/pyi_rth_salt.utils.vt.py
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/pyi_rth_salt.utils.vt.pyc
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/pyi_rth_salt.utils.vt.pyo
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/pyi_rth_subprocess.py
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/pyi_rth_subprocess.pyc
+${PYSITELIB}/salt/utils/pyinstaller/rthooks/pyi_rth_subprocess.pyo
${PYSITELIB}/salt/utils/pyobjects.py
${PYSITELIB}/salt/utils/pyobjects.pyc
${PYSITELIB}/salt/utils/pyobjects.pyo
@@ -5148,6 +5211,9 @@ ${PYSITELIB}/salt/utils/yamldumper.pyo
${PYSITELIB}/salt/utils/yamlencoding.py
${PYSITELIB}/salt/utils/yamlencoding.pyc
${PYSITELIB}/salt/utils/yamlencoding.pyo
+${PYSITELIB}/salt/utils/yamllint.py
+${PYSITELIB}/salt/utils/yamllint.pyc
+${PYSITELIB}/salt/utils/yamllint.pyo
${PYSITELIB}/salt/utils/yamlloader.py
${PYSITELIB}/salt/utils/yamlloader.pyc
${PYSITELIB}/salt/utils/yamlloader.pyo
@@ -5198,7 +5264,6 @@ man/man1/salt-proxy.1
man/man1/salt-run.1
man/man1/salt-ssh.1
man/man1/salt-syndic.1
-man/man1/salt-unity.1
man/man1/salt.1
man/man1/spm.1
man/man7/salt.7
Index: pkgsrc/sysutils/salt/distinfo
diff -u pkgsrc/sysutils/salt/distinfo:1.45 pkgsrc/sysutils/salt/distinfo:1.46
--- pkgsrc/sysutils/salt/distinfo:1.45 Sun Nov 14 20:01:17 2021
+++ pkgsrc/sysutils/salt/distinfo Mon Oct 31 17:32:46 2022
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.45 2021/11/14 20:01:17 adam Exp $
+$NetBSD: distinfo,v 1.46 2022/10/31 17:32:46 adam Exp $
-BLAKE2s (salt-3004.tar.gz) = 0cd3a091dffd079f8ce020c365e93012ad659897d6aa2daf346bdd4f74fd6a0b
-SHA512 (salt-3004.tar.gz) = edc609daa5ccb4521950fa0df06383e502b49691e0a9f410f6985f3d1cb127905f89c3b0c88ffb88acf082dfa2011b6dd1aa714666c6af6ad09135aceb7dd228
-Size (salt-3004.tar.gz) = 17663985 bytes
+BLAKE2s (salt-3005.1.tar.gz) = f38b92b39471dabcb772098071ccc5f6b02048143a7e170c572e9886d334c0fb
+SHA512 (salt-3005.1.tar.gz) = 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
+Size (salt-3005.1.tar.gz) = 17914349 bytes
+SHA1 (patch-requirements_base.txt) = 32519497d29b2e27101db471d07129f52198e1a9
+SHA1 (patch-salt_utils_rsax931.py) = d357a3d13e579fc131d6449d0968d9d6aa6920bf
SHA1 (patch-salt_version.py) = 45f9552d286ec03a38efe9e6655ff520334f31db
Index: pkgsrc/sysutils/salt-docs/Makefile
diff -u pkgsrc/sysutils/salt-docs/Makefile:1.28 pkgsrc/sysutils/salt-docs/Makefile:1.29
--- pkgsrc/sysutils/salt-docs/Makefile:1.28 Sun Jul 10 19:25:00 2022
+++ pkgsrc/sysutils/salt-docs/Makefile Mon Oct 31 17:32:46 2022
@@ -1,15 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2022/07/10 19:25:00 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/10/31 17:32:46 adam Exp $
+
+.include "../../sysutils/salt/Makefile.common"
-DISTNAME= salt-3004
PKGNAME= ${DISTNAME:S/-/-docs-/}
-PKGREVISION= 2
-CATEGORIES= sysutils python
-MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/}
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://saltstack.org/
COMMENT= Documentation for salt
-LICENSE= apache-2.0
USE_TOOLS+= gmake pax
Added files:
Index: pkgsrc/sysutils/salt/Makefile.common
diff -u /dev/null pkgsrc/sysutils/salt/Makefile.common:1.1
--- /dev/null Mon Oct 31 17:32:46 2022
+++ pkgsrc/sysutils/salt/Makefile.common Mon Oct 31 17:32:46 2022
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.common,v 1.1 2022/10/31 17:32:46 adam Exp $
+# used by sysutils/salt/Makefile
+# used by sysutils/salt-docs/Makefile
+
+DISTNAME= salt-3005.1
+CATEGORIES= sysutils python
+MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://saltproject.io/
+LICENSE= apache-2.0
+
+DISTINFO_FILE= ${.CURDIR}/../../sysutils/salt/distinfo
+PATCHDIR= ${.CURDIR}/../../sysutils/salt/patches
+
+PYTHON_VERSIONS_INCOMPATIBLE= 27
Index: pkgsrc/sysutils/salt/patches/patch-requirements_base.txt
diff -u /dev/null pkgsrc/sysutils/salt/patches/patch-requirements_base.txt:1.1
--- /dev/null Mon Oct 31 17:32:46 2022
+++ pkgsrc/sysutils/salt/patches/patch-requirements_base.txt Mon Oct 31 17:32:46 2022
@@ -0,0 +1,12 @@
+$NetBSD: patch-requirements_base.txt,v 1.1 2022/10/31 17:32:46 adam Exp $
+
+contextvars module is included in Python 3.7+.
+
+--- requirements/base.txt.orig 2022-10-31 15:04:12.000000000 +0000
++++ requirements/base.txt
+@@ -5,5 +5,4 @@ PyYAML
+ MarkupSafe
+ requests>=1.0.0
+ distro>=1.0.1
+-contextvars
+ psutil>=5.0.0
Index: pkgsrc/sysutils/salt/patches/patch-salt_utils_rsax931.py
diff -u /dev/null pkgsrc/sysutils/salt/patches/patch-salt_utils_rsax931.py:1.1
--- /dev/null Mon Oct 31 17:32:46 2022
+++ pkgsrc/sysutils/salt/patches/patch-salt_utils_rsax931.py Mon Oct 31 17:32:46 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-salt_utils_rsax931.py,v 1.1 2022/10/31 17:32:46 adam Exp $
+
+Skip hacks for finding libcrypto on Darwin.
+
+--- salt/utils/rsax931.py.orig 2022-10-31 16:43:56.000000000 +0000
++++ salt/utils/rsax931.py
+@@ -25,7 +25,7 @@ def _find_libcrypto():
+ """
+ if sys.platform.startswith("win"):
+ lib = "libeay32"
+- elif salt.utils.platform.is_darwin():
++ elif False:
+ # will look for several different location on the system,
+ # Search in the following order. salts pkg, homebrew, macports, finnally
+ # system.
Home |
Main Index |
Thread Index |
Old Index