CVS commit: pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 22 Jan 2024 16:35:25 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan 22 16:35:25 UTC 2024

Modified Files:
        pkgsrc/sysutils/salt: Makefile Makefile.common PLIST distinfo
        pkgsrc/sysutils/salt-docs: Makefile
        pkgsrc/sysutils/salt/patches: patch-salt_utils_rsax931.py
Removed Files:
        pkgsrc/sysutils/salt/patches: patch-doc_conf.py
            patch-requirements_base.txt

Log Message:
salt salt-docs: updated to 3006.5

SALT 3006.5

REMOVED

Tech Debt - support for pysss removed due to functionality addition in Python 3.3

FIXED

Improved error message when state arguments are accidentally passed as a string

Allow pip.install to create a log file that is passed in if the parent directory is writeable

Fixed merging of complex pillar overrides with salt-ssh states

Fixed gpg pillar rendering with salt-ssh

Made salt-ssh states not re-render pillars unnecessarily

Made Salt maintain options in Debian package repo definitions

Migrated all invoke tasks to python-tools-scripts.

tasks/docs.py -> tools/precommit/docs.py

tasks/docstrings.py -> tools/precommit/docstrings.py

tasks/loader.py -> tools/precommit/loader.py

tasks/filemap.py -> tools/precommit/filemap.py

Fix salt user login shell path in Debian packages

Fill out lsb_distrib_xxxx (best estimate) grains if problems with retrieving lsb_release data

Fixed an issue in the file.directory state where the children_only keyword argument was not being respected.

Move salt.ufw to correct location /etc/ufw/applications.d/

Fixed salt-ssh stacktrace when retcode is not an integer

Fixed SSH shell seldomly fails to report any exit code

Fixed some issues in x509_v2 execution module private key functions

Fixed grp.getgrall() in utils/user.py causing performance issues

Fix user.list_groups omits remote groups via sssd, etc.

Ensure sync from _grains occurs before attempting pillar compilation in case custom grain used in pillar file

Moved gitfs locks to salt working dir to avoid lock wipes

Only attempt to create a keys directory when --gen-keys is passed to the salt-key CLI

Fix nonce verification, request server replies do not stomp on eachother.

speed up yumpkg list_pkgs by not requiring digest or signature verification on lookup.

Fix pkg.latest failing on windows for winrepo packages where the package is already up to date

Ensure kwarg is preserved when checking for kwargs. This change affects proxy minions when used with Deltaproxy, which had kwargs popped when targeting multiple minions id.

Fixes traceback when state id is an int in a reactor SLS file.

Install logrotate config as /etc/logrotate.d/salt-common for Debian packages Remove broken /etc/logrotate.d/salt directory from 3006.3 if it exists.

Use sha256 as the default hash_type. It has been the default since Salt v2016.9

Preserve ownership on log rotation

Ensure that the correct value of jid_inclue is passed if the argument is included in the passed keyword arguments.

Uprade relenv to 0.14.2

Update openssl to address CVE-2023-5363.

Fix bug in openssl setup when openssl binary can't be found.

Add M1 mac support.

Fix regex for filespec adding/deleting fcontext policy in selinux

Ensure CLI options take priority over Saltfile options

Test mode for state function saltmod.wheel no longer set's result to (None,)

Client only process events which tag conforms to an event return.

Fixes an issue setting user or machine policy on Windows when the Group Policy directory is missing

Fix regression in file module which was not re-using a file client.

pip.installed state will now properly fail when a specified user does not exists

Publish channel connect callback method properly closes it's request channel.

Ensured the pillar in SSH wrapper modules is the same as the one used in template rendering when overrides are passed

Fix file.comment ignore_missing not working with multiline char

Warn when an un-closed transport client is being garbage collected.

Only generate the HMAC's for libssl.so.1.1 and libcrypto.so.1.1 if those files exist.

Fixed an issue where Salt Cloud would fail if it could not delete lingering PAexec binaries

ADDED

Added Salt support for Debian 12

Added Salt support for Amazon Linux 2023

SECURITY

Bump to cryptography==41.0.4 due to https://github.com/advisories/GHSA-v8gr-m533-ghj9

Bump to cryptography==41.0.7 due to https://github.com/advisories/GHSA-jfhm-5ghh-2f97


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/sysutils/salt/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/salt/Makefile.common
cvs rdiff -u -r1.31 -r1.32 pkgsrc/sysutils/salt/PLIST
cvs rdiff -u -r1.47 -r1.48 pkgsrc/sysutils/salt/distinfo
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/salt-docs/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/salt/patches/patch-doc_conf.py \
    pkgsrc/sysutils/salt/patches/patch-requirements_base.txt
cvs rdiff -u -r1.1 -r1.2 \
    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.82 pkgsrc/sysutils/salt/Makefile:1.83
--- pkgsrc/sysutils/salt/Makefile:1.82  Mon Aug 14 05:25:18 2023
+++ pkgsrc/sysutils/salt/Makefile       Mon Jan 22 16:35:25 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.82 2023/08/14 05:25:18 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2024/01/22 16:35:25 adam Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 COMMENT=       Remote execution and configuration management system
@@ -9,8 +8,10 @@ DEPENDS+=      ${PYPKGPREFIX}-cryptodome>=3.9
 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}-looseversion-[0-9]*:../../devel/py-looseversion
 DEPENDS+=      ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe
 DEPENDS+=      ${PYPKGPREFIX}-msgpack>=0.5.6:../../devel/py-msgpack
+DEPENDS+=      ${PYPKGPREFIX}-packaging>=21.3:../../devel/py-packaging
 DEPENDS+=      ${PYPKGPREFIX}-psutil>=5.0.0:../../sysutils/py-psutil
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.5.0:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
@@ -18,6 +19,8 @@ DEPENDS+=     ${PYPKGPREFIX}-zmq>=19.0.2:../
 
 USE_PKG_RESOURCES=     yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27 312
+
 BUILD_DEFS+=   VARBASE
 
 PYSETUPARGS+=  --salt-base-file-roots-dir=${VARBASE}/salt/file-roots

Index: pkgsrc/sysutils/salt/Makefile.common
diff -u pkgsrc/sysutils/salt/Makefile.common:1.1 pkgsrc/sysutils/salt/Makefile.common:1.2
--- pkgsrc/sysutils/salt/Makefile.common:1.1    Mon Oct 31 17:32:46 2022
+++ pkgsrc/sysutils/salt/Makefile.common        Mon Jan 22 16:35:25 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1 2022/10/31 17:32:46 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2024/01/22 16:35:25 adam Exp $
 # used by sysutils/salt/Makefile
 # used by sysutils/salt-docs/Makefile
 
-DISTNAME=      salt-3005.1
+DISTNAME=      salt-3006.5
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/salt/}
 
@@ -13,4 +13,4 @@ LICENSE=      apache-2.0
 DISTINFO_FILE= ${.CURDIR}/../../sysutils/salt/distinfo
 PATCHDIR=      ${.CURDIR}/../../sysutils/salt/patches
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+USE_LANGUAGES= # none

Index: pkgsrc/sysutils/salt/PLIST
diff -u pkgsrc/sysutils/salt/PLIST:1.31 pkgsrc/sysutils/salt/PLIST:1.32
--- pkgsrc/sysutils/salt/PLIST:1.31     Mon Oct 31 17:32:46 2022
+++ pkgsrc/sysutils/salt/PLIST  Mon Jan 22 16:35:25 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2022/10/31 17:32:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2024/01/22 16:35:25 adam Exp $
 bin/salt
 bin/salt-api
 bin/salt-call
@@ -7,6 +7,7 @@ bin/salt-cp
 bin/salt-key
 bin/salt-master
 bin/salt-minion
+bin/salt-pip
 bin/salt-proxy
 bin/salt-run
 bin/salt-ssh
@@ -40,9 +41,7 @@ ${PYSITELIB}/salt/_logging/mixins.pyo
 ${PYSITELIB}/salt/_syspaths.py
 ${PYSITELIB}/salt/_syspaths.pyc
 ${PYSITELIB}/salt/_syspaths.pyo
-${PYSITELIB}/salt/_version.py
-${PYSITELIB}/salt/_version.pyc
-${PYSITELIB}/salt/_version.pyo
+${PYSITELIB}/salt/_version.txt
 ${PYSITELIB}/salt/acl/__init__.py
 ${PYSITELIB}/salt/acl/__init__.pyc
 ${PYSITELIB}/salt/acl/__init__.pyo
@@ -530,6 +529,9 @@ ${PYSITELIB}/salt/engines/script.pyo
 ${PYSITELIB}/salt/engines/slack.py
 ${PYSITELIB}/salt/engines/slack.pyc
 ${PYSITELIB}/salt/engines/slack.pyo
+${PYSITELIB}/salt/engines/slack_bolt_engine.py
+${PYSITELIB}/salt/engines/slack_bolt_engine.pyc
+${PYSITELIB}/salt/engines/slack_bolt_engine.pyo
 ${PYSITELIB}/salt/engines/sqs_events.py
 ${PYSITELIB}/salt/engines/sqs_events.pyc
 ${PYSITELIB}/salt/engines/sqs_events.pyo
@@ -652,6 +654,7 @@ ${PYSITELIB}/salt/ext/tornado/platform/a
 ${PYSITELIB}/salt/ext/tornado/platform/asyncio.pyo
 ${PYSITELIB}/salt/ext/tornado/platform/auto.py
 ${PYSITELIB}/salt/ext/tornado/platform/auto.pyc
+${PYSITELIB}/salt/ext/tornado/platform/auto.pyi
 ${PYSITELIB}/salt/ext/tornado/platform/auto.pyo
 ${PYSITELIB}/salt/ext/tornado/platform/caresresolver.py
 ${PYSITELIB}/salt/ext/tornado/platform/caresresolver.pyc
@@ -692,6 +695,7 @@ ${PYSITELIB}/salt/ext/tornado/routing.py
 ${PYSITELIB}/salt/ext/tornado/simple_httpclient.py
 ${PYSITELIB}/salt/ext/tornado/simple_httpclient.pyc
 ${PYSITELIB}/salt/ext/tornado/simple_httpclient.pyo
+${PYSITELIB}/salt/ext/tornado/speedups.pyi
 ${PYSITELIB}/salt/ext/tornado/stack_context.py
 ${PYSITELIB}/salt/ext/tornado/stack_context.pyc
 ${PYSITELIB}/salt/ext/tornado/stack_context.pyo
@@ -926,6 +930,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_azure.py
+${PYSITELIB}/salt/grains/metadata_azure.pyc
+${PYSITELIB}/salt/grains/metadata_azure.pyo
 ${PYSITELIB}/salt/grains/metadata_gce.py
 ${PYSITELIB}/salt/grains/metadata_gce.pyc
 ${PYSITELIB}/salt/grains/metadata_gce.pyo
@@ -974,6 +981,9 @@ ${PYSITELIB}/salt/loader/__init__.pyo
 ${PYSITELIB}/salt/loader/context.py
 ${PYSITELIB}/salt/loader/context.pyc
 ${PYSITELIB}/salt/loader/context.pyo
+${PYSITELIB}/salt/loader/dunder.py
+${PYSITELIB}/salt/loader/dunder.pyc
+${PYSITELIB}/salt/loader/dunder.pyo
 ${PYSITELIB}/salt/loader/lazy.py
 ${PYSITELIB}/salt/loader/lazy.pyc
 ${PYSITELIB}/salt/loader/lazy.pyo
@@ -2537,6 +2547,9 @@ ${PYSITELIB}/salt/modules/win_dns_client
 ${PYSITELIB}/salt/modules/win_dsc.py
 ${PYSITELIB}/salt/modules/win_dsc.pyc
 ${PYSITELIB}/salt/modules/win_dsc.pyo
+${PYSITELIB}/salt/modules/win_event.py
+${PYSITELIB}/salt/modules/win_event.pyc
+${PYSITELIB}/salt/modules/win_event.pyo
 ${PYSITELIB}/salt/modules/win_file.py
 ${PYSITELIB}/salt/modules/win_file.pyc
 ${PYSITELIB}/salt/modules/win_file.pyo
@@ -2555,6 +2568,9 @@ ${PYSITELIB}/salt/modules/win_ip.pyo
 ${PYSITELIB}/salt/modules/win_lgpo.py
 ${PYSITELIB}/salt/modules/win_lgpo.pyc
 ${PYSITELIB}/salt/modules/win_lgpo.pyo
+${PYSITELIB}/salt/modules/win_lgpo_reg.py
+${PYSITELIB}/salt/modules/win_lgpo_reg.pyc
+${PYSITELIB}/salt/modules/win_lgpo_reg.pyo
 ${PYSITELIB}/salt/modules/win_license.py
 ${PYSITELIB}/salt/modules/win_license.pyc
 ${PYSITELIB}/salt/modules/win_license.pyo
@@ -2627,6 +2643,9 @@ ${PYSITELIB}/salt/modules/wordpress.pyo
 ${PYSITELIB}/salt/modules/x509.py
 ${PYSITELIB}/salt/modules/x509.pyc
 ${PYSITELIB}/salt/modules/x509.pyo
+${PYSITELIB}/salt/modules/x509_v2.py
+${PYSITELIB}/salt/modules/x509_v2.pyc
+${PYSITELIB}/salt/modules/x509_v2.pyo
 ${PYSITELIB}/salt/modules/xapi_virt.py
 ${PYSITELIB}/salt/modules/xapi_virt.pyc
 ${PYSITELIB}/salt/modules/xapi_virt.pyo
@@ -3233,6 +3252,9 @@ ${PYSITELIB}/salt/roster/scan.pyo
 ${PYSITELIB}/salt/roster/sshconfig.py
 ${PYSITELIB}/salt/roster/sshconfig.pyc
 ${PYSITELIB}/salt/roster/sshconfig.pyo
+${PYSITELIB}/salt/roster/sshknownhosts.py
+${PYSITELIB}/salt/roster/sshknownhosts.pyc
+${PYSITELIB}/salt/roster/sshknownhosts.pyo
 ${PYSITELIB}/salt/roster/terraform.py
 ${PYSITELIB}/salt/roster/terraform.pyc
 ${PYSITELIB}/salt/roster/terraform.pyo
@@ -3434,6 +3456,9 @@ ${PYSITELIB}/salt/serializers/configpars
 ${PYSITELIB}/salt/serializers/json.py
 ${PYSITELIB}/salt/serializers/json.pyc
 ${PYSITELIB}/salt/serializers/json.pyo
+${PYSITELIB}/salt/serializers/keyvalue.py
+${PYSITELIB}/salt/serializers/keyvalue.pyc
+${PYSITELIB}/salt/serializers/keyvalue.pyo
 ${PYSITELIB}/salt/serializers/msgpack.py
 ${PYSITELIB}/salt/serializers/msgpack.pyc
 ${PYSITELIB}/salt/serializers/msgpack.pyo
@@ -3443,9 +3468,9 @@ ${PYSITELIB}/salt/serializers/plist.pyo
 ${PYSITELIB}/salt/serializers/python.py
 ${PYSITELIB}/salt/serializers/python.pyc
 ${PYSITELIB}/salt/serializers/python.pyo
-${PYSITELIB}/salt/serializers/toml.py
-${PYSITELIB}/salt/serializers/toml.pyc
-${PYSITELIB}/salt/serializers/toml.pyo
+${PYSITELIB}/salt/serializers/tomlmod.py
+${PYSITELIB}/salt/serializers/tomlmod.pyc
+${PYSITELIB}/salt/serializers/tomlmod.pyo
 ${PYSITELIB}/salt/serializers/yaml.py
 ${PYSITELIB}/salt/serializers/yaml.pyc
 ${PYSITELIB}/salt/serializers/yaml.pyo
@@ -4130,6 +4155,9 @@ ${PYSITELIB}/salt/states/openstack_confi
 ${PYSITELIB}/salt/states/openvswitch_bridge.py
 ${PYSITELIB}/salt/states/openvswitch_bridge.pyc
 ${PYSITELIB}/salt/states/openvswitch_bridge.pyo
+${PYSITELIB}/salt/states/openvswitch_db.py
+${PYSITELIB}/salt/states/openvswitch_db.pyc
+${PYSITELIB}/salt/states/openvswitch_db.pyo
 ${PYSITELIB}/salt/states/openvswitch_port.py
 ${PYSITELIB}/salt/states/openvswitch_port.pyc
 ${PYSITELIB}/salt/states/openvswitch_port.pyo
@@ -4352,6 +4380,9 @@ ${PYSITELIB}/salt/states/svn.pyo
 ${PYSITELIB}/salt/states/sysctl.py
 ${PYSITELIB}/salt/states/sysctl.pyc
 ${PYSITELIB}/salt/states/sysctl.pyo
+${PYSITELIB}/salt/states/sysfs.py
+${PYSITELIB}/salt/states/sysfs.pyc
+${PYSITELIB}/salt/states/sysfs.pyo
 ${PYSITELIB}/salt/states/syslog_ng.py
 ${PYSITELIB}/salt/states/syslog_ng.pyc
 ${PYSITELIB}/salt/states/syslog_ng.pyo
@@ -4430,6 +4461,9 @@ ${PYSITELIB}/salt/states/win_iis.pyo
 ${PYSITELIB}/salt/states/win_lgpo.py
 ${PYSITELIB}/salt/states/win_lgpo.pyc
 ${PYSITELIB}/salt/states/win_lgpo.pyo
+${PYSITELIB}/salt/states/win_lgpo_reg.py
+${PYSITELIB}/salt/states/win_lgpo_reg.pyc
+${PYSITELIB}/salt/states/win_lgpo_reg.pyo
 ${PYSITELIB}/salt/states/win_license.py
 ${PYSITELIB}/salt/states/win_license.pyc
 ${PYSITELIB}/salt/states/win_license.pyo
@@ -4475,6 +4509,9 @@ ${PYSITELIB}/salt/states/wordpress.pyo
 ${PYSITELIB}/salt/states/x509.py
 ${PYSITELIB}/salt/states/x509.pyc
 ${PYSITELIB}/salt/states/x509.pyo
+${PYSITELIB}/salt/states/x509_v2.py
+${PYSITELIB}/salt/states/x509_v2.pyc
+${PYSITELIB}/salt/states/x509_v2.pyo
 ${PYSITELIB}/salt/states/xml.py
 ${PYSITELIB}/salt/states/xml.pyc
 ${PYSITELIB}/salt/states/xml.pyo
@@ -4683,9 +4720,6 @@ ${PYSITELIB}/salt/utils/azurearm.pyo
 ${PYSITELIB}/salt/utils/beacons.py
 ${PYSITELIB}/salt/utils/beacons.pyc
 ${PYSITELIB}/salt/utils/beacons.pyo
-${PYSITELIB}/salt/utils/boto3_elasticsearch.py
-${PYSITELIB}/salt/utils/boto3_elasticsearch.pyc
-${PYSITELIB}/salt/utils/boto3_elasticsearch.pyo
 ${PYSITELIB}/salt/utils/boto3mod.py
 ${PYSITELIB}/salt/utils/boto3mod.pyc
 ${PYSITELIB}/salt/utils/boto3mod.pyo
@@ -5007,24 +5041,6 @@ ${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
@@ -5169,6 +5185,9 @@ ${PYSITELIB}/salt/utils/win_lgpo_auditpo
 ${PYSITELIB}/salt/utils/win_lgpo_netsh.py
 ${PYSITELIB}/salt/utils/win_lgpo_netsh.pyc
 ${PYSITELIB}/salt/utils/win_lgpo_netsh.pyo
+${PYSITELIB}/salt/utils/win_lgpo_reg.py
+${PYSITELIB}/salt/utils/win_lgpo_reg.pyc
+${PYSITELIB}/salt/utils/win_lgpo_reg.pyo
 ${PYSITELIB}/salt/utils/win_network.py
 ${PYSITELIB}/salt/utils/win_network.pyc
 ${PYSITELIB}/salt/utils/win_network.pyo
@@ -5196,6 +5215,9 @@ ${PYSITELIB}/salt/utils/win_update.pyo
 ${PYSITELIB}/salt/utils/winapi.py
 ${PYSITELIB}/salt/utils/winapi.pyc
 ${PYSITELIB}/salt/utils/winapi.pyo
+${PYSITELIB}/salt/utils/x509.py
+${PYSITELIB}/salt/utils/x509.pyc
+${PYSITELIB}/salt/utils/x509.pyo
 ${PYSITELIB}/salt/utils/xdg.py
 ${PYSITELIB}/salt/utils/xdg.pyc
 ${PYSITELIB}/salt/utils/xdg.pyo

Index: pkgsrc/sysutils/salt/distinfo
diff -u pkgsrc/sysutils/salt/distinfo:1.47 pkgsrc/sysutils/salt/distinfo:1.48
--- pkgsrc/sysutils/salt/distinfo:1.47  Sun May  7 13:09:52 2023
+++ pkgsrc/sysutils/salt/distinfo       Mon Jan 22 16:35:25 2024
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.47 2023/05/07 13:09:52 wiz Exp $
+$NetBSD: distinfo,v 1.48 2024/01/22 16:35:25 adam Exp $
 
-BLAKE2s (salt-3005.1.tar.gz) = f38b92b39471dabcb772098071ccc5f6b02048143a7e170c572e9886d334c0fb
-SHA512 (salt-3005.1.tar.gz) = 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
-Size (salt-3005.1.tar.gz) = 17914349 bytes
-SHA1 (patch-doc_conf.py) = 4e6049462ce27148bea1c596c80eb3f9f1796b99
-SHA1 (patch-requirements_base.txt) = 32519497d29b2e27101db471d07129f52198e1a9
-SHA1 (patch-salt_utils_rsax931.py) = d357a3d13e579fc131d6449d0968d9d6aa6920bf
+BLAKE2s (salt-3006.5.tar.gz) = a56c0daf6a1dbe8c15d6cca6550e7a4287adcf47121d2048a3ee0da587dc6cb3
+SHA512 (salt-3006.5.tar.gz) = 8aaf5c5d36d8aa17b3fe867cee470f7b3c5dd1f6abaf5bdb49a3df76d3498d0dc1fa305a069bc95ad057489db229454b38b0ea9c1ade1e46b5d9b57aeef10c23
+Size (salt-3006.5.tar.gz) = 20536455 bytes
+SHA1 (patch-salt_utils_rsax931.py) = 3dd9bed9900908999b2c0b8e6347ce01fa4c62d5
 SHA1 (patch-salt_version.py) = 45f9552d286ec03a38efe9e6655ff520334f31db

Index: pkgsrc/sysutils/salt-docs/Makefile
diff -u pkgsrc/sysutils/salt-docs/Makefile:1.34 pkgsrc/sysutils/salt-docs/Makefile:1.35
--- pkgsrc/sysutils/salt-docs/Makefile:1.34     Tue Nov  7 22:38:04 2023
+++ pkgsrc/sysutils/salt-docs/Makefile  Mon Jan 22 16:35:25 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.34 2023/11/07 22:38:04 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2024/01/22 16:35:25 adam Exp $
 
-PKGREVISION= 2
 .include "../../sysutils/salt/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-docs-/}
@@ -10,7 +9,11 @@ COMMENT=      Documentation for salt
 USE_TOOLS+=    gmake pax
 
 TOOL_DEPENDS+= salt-[0-9]*:../../sysutils/salt
-TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-linkify-it-py-[0-9]*:../../textproc/py-linkify-it-py
+TOOL_DEPENDS+= ${PYPKGPREFIX}-looseversion-[0-9]*:../../devel/py-looseversion
+TOOL_DEPENDS+= ${PYPKGPREFIX}-myst-parser-[0-9]*:../../textproc/py-myst-parser
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinxcontrib-httpdomain-[0-9]*:../../textproc/py-sphinxcontrib-httpdomain
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinxcontrib-spelling-[0-9]*:../../textproc/py-sphinxcontrib-spelling
 
 NO_CONFIGURE=  yes
 BUILD_DIRS=    doc
@@ -23,7 +26,7 @@ PLIST_SRC=    ${WRKDIR}/.PLIST_SRC
 
 INSTALLATION_DIRS=     ${HTMLDIR}
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 38
+PYTHON_VERSIONS_INCOMPATIBLE=  27 38 312
 
 # Contains hardcoded paths that may refer to paths used during the build, for
 # example /opt/tools on SmartOS.

Index: pkgsrc/sysutils/salt/patches/patch-salt_utils_rsax931.py
diff -u pkgsrc/sysutils/salt/patches/patch-salt_utils_rsax931.py:1.1 pkgsrc/sysutils/salt/patches/patch-salt_utils_rsax931.py:1.2
--- pkgsrc/sysutils/salt/patches/patch-salt_utils_rsax931.py:1.1        Mon Oct 31 17:32:46 2022
+++ pkgsrc/sysutils/salt/patches/patch-salt_utils_rsax931.py    Mon Jan 22 16:35:25 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-salt_utils_rsax931.py,v 1.1 2022/10/31 17:32:46 adam Exp $
+$NetBSD: patch-salt_utils_rsax931.py,v 1.2 2024/01/22 16:35:25 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.orig 2023-12-12 18:03:35.000000000 +0000
 +++ salt/utils/rsax931.py
-@@ -25,7 +25,7 @@ def _find_libcrypto():
-     """
-     if sys.platform.startswith("win"):
-         lib = "libeay32"
+@@ -31,7 +31,7 @@ def _find_libcrypto():
+             if lib:
+                 break
+ 
 -    elif salt.utils.platform.is_darwin():
 +    elif False:
          # will look for several different location on the system,

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index