Merge 3006.x into 3007.x

2025-04-15 17:20:19 +00:00 · 2024-02-21 19:14:47 +00:00 · 2024-02-21 19:14:47 +00:00 · 823886028b
commit 823886028b
parent 66d8a33c88 ce9d09bc9c
51 changed files with 833 additions and 152 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -448,7 +448,7 @@ jobs:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
      github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"

  build-salt-onedir:
@ -464,7 +464,7 @@ jobs:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
      github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"

  build-pkgs-onedir:
@ -477,7 +477,7 @@ jobs:
    with:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"
      source: "onedir"

@ -491,7 +491,7 @@ jobs:
    with:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"
      source: "src"
  build-ci-deps:
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@ -500,7 +500,7 @@ jobs:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
      github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"

  build-salt-onedir:
@ -516,7 +516,7 @@ jobs:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
      github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"

  build-pkgs-onedir:
@ -529,7 +529,7 @@ jobs:
    with:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"
      source: "onedir"
      environment: nightly
@ -547,7 +547,7 @@ jobs:
    with:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"
      source: "src"
      environment: nightly
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@ -490,7 +490,7 @@ jobs:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
      github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"

  build-salt-onedir:
@ -506,7 +506,7 @@ jobs:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
      github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"

  build-pkgs-onedir:
@ -519,7 +519,7 @@ jobs:
    with:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"
      source: "onedir"

@ -533,7 +533,7 @@ jobs:
    with:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"
      source: "src"
  build-ci-deps:
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@ -487,7 +487,7 @@ jobs:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
      github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"

  build-salt-onedir:
@ -503,7 +503,7 @@ jobs:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
      github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"

  build-pkgs-onedir:
@ -516,7 +516,7 @@ jobs:
    with:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"
      source: "onedir"
      environment: staging
@ -534,7 +534,7 @@ jobs:
    with:
      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.14.2"
+      relenv-version: "0.15.1"
      python-version: "3.10.13"
      source: "src"
      environment: staging
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -45,7 +45,7 @@ repos:
            salt/ext/.*
          )$

-  - repo: https://github.com/s0undt3ch/python-tools-scripts
+  - repo: https://github.com/saltstack/python-tools-scripts
    rev: "0.18.6"
    hooks:
      - id: tools
@ -1416,7 +1416,7 @@ repos:
    hooks:
      - id: remove-import-headers

-  - repo: https://github.com/s0undt3ch/salt-rewrite
+  - repo: https://github.com/saltstack/salt-rewrite
    # Automatically rewrite code with known rules
    rev: 2.5.2
    hooks:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -179,6 +179,61 @@ Versions are `MAJOR.PATCH`.
 - Update to `gitpython>=3.1.35` due to https://github.com/advisories/GHSA-wfm5-v35h-vwf4 and https://github.com/advisories/GHSA-cwvm-v4w8-q58c [#65137](https://github.com/saltstack/salt/issues/65137)


+## 3006.7 (2024-02-20)
+
+
+### Deprecated
+
+- Deprecate and stop using ``salt.features`` [#65951](https://github.com/saltstack/salt/issues/65951)
+
+
+### Changed
+
+- Change module search path priority, so Salt extensions can be overridden by syncable modules and module_dirs. You can switch back to the old logic by setting features.enable_deprecated_module_search_path_priority to true, but it will be removed in Salt 3008. [#65938](https://github.com/saltstack/salt/issues/65938)
+
+
+### Fixed
+
+- Fix an issue with mac_shadow that was causing a command execution error when
+  retrieving values that were not yet set. For example, retrieving last login
+  before the user had logged in. [#34658](https://github.com/saltstack/salt/issues/34658)
+- Fixed an issue when keys didn't match because of line endings [#52289](https://github.com/saltstack/salt/issues/52289)
+- Corrected encoding of credentials for use with Artifactory [#63063](https://github.com/saltstack/salt/issues/63063)
+- Use `send_multipart` instead of `send` when sending multipart message. [#65018](https://github.com/saltstack/salt/issues/65018)
+- Fix an issue where the minion would crash on Windows if some of the grains
+  failed to resolve [#65154](https://github.com/saltstack/salt/issues/65154)
+- Fix issue with openscap when the error was outside the expected scope. It now
+  returns failed with the error code and the error [#65193](https://github.com/saltstack/salt/issues/65193)
+- Upgrade relenv to 0.15.0 to fix namespaced packages installed by salt-pip [#65433](https://github.com/saltstack/salt/issues/65433)
+- Fix regression of fileclient re-use when rendering sls pillars and states [#65450](https://github.com/saltstack/salt/issues/65450)
+- Fixes the s3fs backend computing the local cache's files with the wrong hash type [#65589](https://github.com/saltstack/salt/issues/65589)
+- Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration [#65670](https://github.com/saltstack/salt/issues/65670)
+- Fix boto execution module loading [#65691](https://github.com/saltstack/salt/issues/65691)
+- Removed PR 65185 changes since incomplete solution [#65692](https://github.com/saltstack/salt/issues/65692)
+- catch only ret/ events not all returning events. [#65727](https://github.com/saltstack/salt/issues/65727)
+- Fix nonsensical time in fileclient timeout error. [#65752](https://github.com/saltstack/salt/issues/65752)
+- Fixes an issue when reading/modifying ini files that contain unicode characters [#65777](https://github.com/saltstack/salt/issues/65777)
+- added https proxy to the list of proxies so that requests knows what to do with https based proxies [#65824](https://github.com/saltstack/salt/issues/65824)
+- Ensure minion channels are closed on any master connection error. [#65932](https://github.com/saltstack/salt/issues/65932)
+- Fixed issue where Salt can't find libcrypto when pip installed from a cloned repo [#65954](https://github.com/saltstack/salt/issues/65954)
+- Fix RPM package systemd scriptlets to make RPM packages more universal [#65987](https://github.com/saltstack/salt/issues/65987)
+- Fixed an issue where fileclient requests during Pillar rendering cause
+  fileserver backends to be needlessly refreshed. [#65990](https://github.com/saltstack/salt/issues/65990)
+- Fix exceptions being set on futures that are already done in ZeroMQ transport [#66006](https://github.com/saltstack/salt/issues/66006)
+- Use hmac compare_digest method in hashutil module to mitigate potential timing attacks [#66041](https://github.com/saltstack/salt/issues/66041)
+- Fix request channel default timeout regression. In 3006.5 it was changed from
+  60 to 30 and is now set back to 60 by default. [#66061](https://github.com/saltstack/salt/issues/66061)
+- Upgrade relenv to 0.15.1 to fix debugpy support. [#66094](https://github.com/saltstack/salt/issues/66094)
+
+
+### Security
+
+- Bump to ``cryptography==42.0.0`` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
+
+  In the process, we were also required to update to ``pyOpenSSL==24.0.0`` [#66004](https://github.com/saltstack/salt/issues/66004)
+- Bump to `cryptography==42.0.3` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f [#66090](https://github.com/saltstack/salt/issues/66090)
+
+
 ## 3006.6 (2024-01-26)


--- a/changelog/34658.fixed.md
+++ b/changelog/34658.fixed.md
@ -1,3 +0,0 @@
-Fix an issue with mac_shadow that was causing a command execution error when
-retrieving values that were not yet set. For example, retrieving last login
-before the user had logged in.
--- a/changelog/52289.fixed.md
+++ b/changelog/52289.fixed.md
@ -1 +0,0 @@
-Fixed an issue when keys didn't match because of line endings
--- a/changelog/63063.fixed.md
+++ b/changelog/63063.fixed.md
@ -1 +0,0 @@
-Corrected encoding of credentials for use with Artifactory
--- a/changelog/65018.fixed.md
+++ b/changelog/65018.fixed.md
@ -1 +0,0 @@
-Use `send_multipart` instead of `send` when sending multipart message.
--- a/changelog/65154.fixed.md
+++ b/changelog/65154.fixed.md
@ -1,2 +0,0 @@
-Fix an issue where the minion would crash on Windows if some of the grains
-failed to resolve
--- a/changelog/65193.fixed.md
+++ b/changelog/65193.fixed.md
@ -1,2 +0,0 @@
-Fix issue with openscap when the error was outside the expected scope. It now
-returns failed with the error code and the error
--- a/changelog/65450.fixed.md
+++ b/changelog/65450.fixed.md
@ -1 +0,0 @@
-Fix regression of fileclient re-use when rendering sls pillars and states
--- a/changelog/65589.fixed.md
+++ b/changelog/65589.fixed.md
@ -1 +0,0 @@
-Fixes the s3fs backend computing the local cache's files with the wrong hash type
--- a/changelog/65670.fixed.md
+++ b/changelog/65670.fixed.md
@ -1 +0,0 @@
-Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration
--- a/changelog/65691.fixed.md
+++ b/changelog/65691.fixed.md
@ -1 +0,0 @@
-Fix boto execution module loading
--- a/changelog/65692.fixed.md
+++ b/changelog/65692.fixed.md
@ -1 +0,0 @@
-Removed PR 65185 changes since incomplete solution
--- a/changelog/65727.fixed.md
+++ b/changelog/65727.fixed.md
@ -1 +0,0 @@
-catch only ret/ events not all returning events.
--- a/changelog/65752.fixed.md
+++ b/changelog/65752.fixed.md
@ -1 +0,0 @@
-Fix nonsensical time in fileclient timeout error.
--- a/changelog/65777.fixed.md
+++ b/changelog/65777.fixed.md
@ -1 +0,0 @@
-Fixes an issue when reading/modifying ini files that contain unicode characters
--- a/changelog/65824.fixed.md
+++ b/changelog/65824.fixed.md
@ -1 +0,0 @@
-added https proxy to the list of proxies so that requests knows what to do with https based proxies
--- a/changelog/65932.fixed.md
+++ b/changelog/65932.fixed.md
@ -1 +0,0 @@
-Ensure minion channels are closed on any master connection error.
--- a/changelog/65938.changed.md
+++ b/changelog/65938.changed.md
@ -1 +0,0 @@
-Change module search path priority, so Salt extensions can be overridden by syncable modules and module_dirs. You can switch back to the old logic by setting features.enable_deprecated_module_search_path_priority to true, but it will be removed in Salt 3008.
--- a/changelog/65951.deprecated.md
+++ b/changelog/65951.deprecated.md
@ -1 +0,0 @@
-Deprecate and stop using ``salt.features``
--- a/changelog/65954.fixed.md
+++ b/changelog/65954.fixed.md
@ -1 +0,0 @@
-Fixed issue where Salt can't find libcrypto when pip installed from a cloned repo
--- a/changelog/65987.fixed.md
+++ b/changelog/65987.fixed.md
@ -1 +0,0 @@
-Fix RPM package systemd scriptlets to make RPM packages more universal
--- a/changelog/65990.fixed.md
+++ b/changelog/65990.fixed.md
@ -1,2 +0,0 @@
-Fixed an issue where fileclient requests during Pillar rendering cause
-fileserver backends to be needlessly refreshed.
--- a/changelog/66004.security.md
+++ b/changelog/66004.security.md
@ -1,3 +0,0 @@
-Bump to ``cryptography==42.0.0`` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
-
-In the process, we were also required to update to ``pyOpenSSL==24.0.0``
--- a/changelog/66006.fixed.md
+++ b/changelog/66006.fixed.md
@ -1 +0,0 @@
-Fix exceptions being set on futures that are already done in ZeroMQ transport
--- a/changelog/66041.fixed.md
+++ b/changelog/66041.fixed.md
@ -1 +0,0 @@
-Use hmac compare_digest method in hashutil module to mitigate potential timing attacks
--- a/changelog/66061.fixed.md
+++ b/changelog/66061.fixed.md
@ -1,2 +0,0 @@
-Fix request channel default timeout regression. In 3006.5 it was changed from
-60 to 30 and is now set back to 60 by default.
--- a/changelog/66090.security.md
+++ b/changelog/66090.security.md
@ -1 +0,0 @@
-Bump to `cryptography==42.0.3` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
--- a/cicd/shared-gh-workflows-context.yml
+++ b/cicd/shared-gh-workflows-context.yml
@ -1,6 +1,6 @@
 nox_version: "2022.8.7"
 python_version: "3.10.13"
-relenv_version: "0.14.2"
+relenv_version: "0.15.1"
 release_branches:
  - "3006.x"
  - "3007.x"
--- a/doc/man/salt-api.1
+++ b/doc/man/salt-api.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-API" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-API" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .sp
--- a/doc/man/salt-call.1
+++ b/doc/man/salt-call.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-CALL" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-CALL" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .SH SYNOPSIS
--- a/doc/man/salt-cloud.1
+++ b/doc/man/salt-cloud.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-CLOUD" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-CLOUD" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .sp
--- a/doc/man/salt-cp.1
+++ b/doc/man/salt-cp.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-CP" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-CP" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .sp
--- a/doc/man/salt-key.1
+++ b/doc/man/salt-key.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-KEY" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-KEY" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .SH SYNOPSIS
--- a/doc/man/salt-master.1
+++ b/doc/man/salt-master.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-MASTER" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-MASTER" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .sp
--- a/doc/man/salt-minion.1
+++ b/doc/man/salt-minion.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-MINION" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-MINION" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .sp
--- a/doc/man/salt-proxy.1
+++ b/doc/man/salt-proxy.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-PROXY" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-PROXY" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .sp
--- a/doc/man/salt-run.1
+++ b/doc/man/salt-run.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-RUN" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-RUN" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-run \- salt-run Documentation
 .sp
--- a/doc/man/salt-ssh.1
+++ b/doc/man/salt-ssh.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-SSH" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-SSH" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-ssh \- salt-ssh Documentation
 .SH SYNOPSIS
--- a/doc/man/salt-syndic.1
+++ b/doc/man/salt-syndic.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT-SYNDIC" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT-SYNDIC" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt-syndic \- salt-syndic Documentation
 .sp
--- a/doc/man/salt.1
+++ b/doc/man/salt.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SALT" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SALT" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 salt \- salt
 .SH SYNOPSIS
--- a/doc/man/salt.7
+++ b/doc/man/salt.7
--- a/doc/man/spm.1
+++ b/doc/man/spm.1
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "SPM" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
+.TH "SPM" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
 .SH NAME
 spm \- Salt Package Manager Command
 .sp
--- a/doc/topics/releases/3006.7.md
+++ b/doc/topics/releases/3006.7.md
@ -0,0 +1,70 @@
+(release-3006.7)=
+# Salt 3006.7 release notes
+
+<!---
+Do not edit this file. This is auto generated.
+Edit the templates in doc/topics/releases/templates/
+for a given release.
+-->
+
+
+<!--
+Add release specific details below
+-->
+
+<!--
+Do not edit the changelog below.
+This is auto generated.
+-->
+## Changelog
+
+### Deprecated
+
+- Deprecate and stop using ``salt.features`` [#65951](https://github.com/saltstack/salt/issues/65951)
+
+
+### Changed
+
+- Change module search path priority, so Salt extensions can be overridden by syncable modules and module_dirs. You can switch back to the old logic by setting features.enable_deprecated_module_search_path_priority to true, but it will be removed in Salt 3008. [#65938](https://github.com/saltstack/salt/issues/65938)
+
+
+### Fixed
+
+- Fix an issue with mac_shadow that was causing a command execution error when
+  retrieving values that were not yet set. For example, retrieving last login
+  before the user had logged in. [#34658](https://github.com/saltstack/salt/issues/34658)
+- Fixed an issue when keys didn't match because of line endings [#52289](https://github.com/saltstack/salt/issues/52289)
+- Corrected encoding of credentials for use with Artifactory [#63063](https://github.com/saltstack/salt/issues/63063)
+- Use `send_multipart` instead of `send` when sending multipart message. [#65018](https://github.com/saltstack/salt/issues/65018)
+- Fix an issue where the minion would crash on Windows if some of the grains
+  failed to resolve [#65154](https://github.com/saltstack/salt/issues/65154)
+- Fix issue with openscap when the error was outside the expected scope. It now
+  returns failed with the error code and the error [#65193](https://github.com/saltstack/salt/issues/65193)
+- Upgrade relenv to 0.15.0 to fix namespaced packages installed by salt-pip [#65433](https://github.com/saltstack/salt/issues/65433)
+- Fix regression of fileclient re-use when rendering sls pillars and states [#65450](https://github.com/saltstack/salt/issues/65450)
+- Fixes the s3fs backend computing the local cache's files with the wrong hash type [#65589](https://github.com/saltstack/salt/issues/65589)
+- Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration [#65670](https://github.com/saltstack/salt/issues/65670)
+- Fix boto execution module loading [#65691](https://github.com/saltstack/salt/issues/65691)
+- Removed PR 65185 changes since incomplete solution [#65692](https://github.com/saltstack/salt/issues/65692)
+- catch only ret/ events not all returning events. [#65727](https://github.com/saltstack/salt/issues/65727)
+- Fix nonsensical time in fileclient timeout error. [#65752](https://github.com/saltstack/salt/issues/65752)
+- Fixes an issue when reading/modifying ini files that contain unicode characters [#65777](https://github.com/saltstack/salt/issues/65777)
+- added https proxy to the list of proxies so that requests knows what to do with https based proxies [#65824](https://github.com/saltstack/salt/issues/65824)
+- Ensure minion channels are closed on any master connection error. [#65932](https://github.com/saltstack/salt/issues/65932)
+- Fixed issue where Salt can't find libcrypto when pip installed from a cloned repo [#65954](https://github.com/saltstack/salt/issues/65954)
+- Fix RPM package systemd scriptlets to make RPM packages more universal [#65987](https://github.com/saltstack/salt/issues/65987)
+- Fixed an issue where fileclient requests during Pillar rendering cause
+  fileserver backends to be needlessly refreshed. [#65990](https://github.com/saltstack/salt/issues/65990)
+- Fix exceptions being set on futures that are already done in ZeroMQ transport [#66006](https://github.com/saltstack/salt/issues/66006)
+- Use hmac compare_digest method in hashutil module to mitigate potential timing attacks [#66041](https://github.com/saltstack/salt/issues/66041)
+- Fix request channel default timeout regression. In 3006.5 it was changed from
+  60 to 30 and is now set back to 60 by default. [#66061](https://github.com/saltstack/salt/issues/66061)
+- Upgrade relenv to 0.15.1 to fix debugpy support. [#66094](https://github.com/saltstack/salt/issues/66094)
+
+
+### Security
+
+- Bump to ``cryptography==42.0.0`` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
+
+  In the process, we were also required to update to ``pyOpenSSL==24.0.0`` [#66004](https://github.com/saltstack/salt/issues/66004)
+- Bump to `cryptography==42.0.3` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f [#66090](https://github.com/saltstack/salt/issues/66090)
--- a/doc/topics/releases/templates/3006.7.md.template
+++ b/doc/topics/releases/templates/3006.7.md.template
@ -0,0 +1,14 @@
+(release-3006.7)=
+# Salt 3006.7 release notes{{ unreleased }}
+{{ warning }}
+
+<!--
+Add release specific details below
+-->
+
+<!--
+Do not edit the changelog below.
+This is auto generated.
+-->
+## Changelog
+{{ changelog }}
--- a/pkg/debian/changelog
+++ b/pkg/debian/changelog
@ -1,3 +1,57 @@
+salt (3006.7) stable; urgency=medium
+
+
+  # Deprecated
+
+  * Deprecate and stop using ``salt.features`` [#65951](https://github.com/saltstack/salt/issues/65951)
+
+  # Changed
+
+  * Change module search path priority, so Salt extensions can be overridden by syncable modules and module_dirs. You can switch back to the old logic by setting features.enable_deprecated_module_search_path_priority to true, but it will be removed in Salt 3008. [#65938](https://github.com/saltstack/salt/issues/65938)
+
+  # Fixed
+
+  * Fix an issue with mac_shadow that was causing a command execution error when
+    retrieving values that were not yet set. For example, retrieving last login
+    before the user had logged in. [#34658](https://github.com/saltstack/salt/issues/34658)
+  * Fixed an issue when keys didn't match because of line endings [#52289](https://github.com/saltstack/salt/issues/52289)
+  * Corrected encoding of credentials for use with Artifactory [#63063](https://github.com/saltstack/salt/issues/63063)
+  * Use `send_multipart` instead of `send` when sending multipart message. [#65018](https://github.com/saltstack/salt/issues/65018)
+  * Fix an issue where the minion would crash on Windows if some of the grains
+    failed to resolve [#65154](https://github.com/saltstack/salt/issues/65154)
+  * Fix issue with openscap when the error was outside the expected scope. It now
+    returns failed with the error code and the error [#65193](https://github.com/saltstack/salt/issues/65193)
+  * Upgrade relenv to 0.15.0 to fix namespaced packages installed by salt-pip [#65433](https://github.com/saltstack/salt/issues/65433)
+  * Fix regression of fileclient re-use when rendering sls pillars and states [#65450](https://github.com/saltstack/salt/issues/65450)
+  * Fixes the s3fs backend computing the local cache's files with the wrong hash type [#65589](https://github.com/saltstack/salt/issues/65589)
+  * Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration [#65670](https://github.com/saltstack/salt/issues/65670)
+  * Fix boto execution module loading [#65691](https://github.com/saltstack/salt/issues/65691)
+  * Removed PR 65185 changes since incomplete solution [#65692](https://github.com/saltstack/salt/issues/65692)
+  * catch only ret/ events not all returning events. [#65727](https://github.com/saltstack/salt/issues/65727)
+  * Fix nonsensical time in fileclient timeout error. [#65752](https://github.com/saltstack/salt/issues/65752)
+  * Fixes an issue when reading/modifying ini files that contain unicode characters [#65777](https://github.com/saltstack/salt/issues/65777)
+  * added https proxy to the list of proxies so that requests knows what to do with https based proxies [#65824](https://github.com/saltstack/salt/issues/65824)
+  * Ensure minion channels are closed on any master connection error. [#65932](https://github.com/saltstack/salt/issues/65932)
+  * Fixed issue where Salt can't find libcrypto when pip installed from a cloned repo [#65954](https://github.com/saltstack/salt/issues/65954)
+  * Fix RPM package systemd scriptlets to make RPM packages more universal [#65987](https://github.com/saltstack/salt/issues/65987)
+  * Fixed an issue where fileclient requests during Pillar rendering cause
+    fileserver backends to be needlessly refreshed. [#65990](https://github.com/saltstack/salt/issues/65990)
+  * Fix exceptions being set on futures that are already done in ZeroMQ transport [#66006](https://github.com/saltstack/salt/issues/66006)
+  * Use hmac compare_digest method in hashutil module to mitigate potential timing attacks [#66041](https://github.com/saltstack/salt/issues/66041)
+  * Fix request channel default timeout regression. In 3006.5 it was changed from
+    60 to 30 and is now set back to 60 by default. [#66061](https://github.com/saltstack/salt/issues/66061)
+  * Upgrade relenv to 0.15.1 to fix debugpy support. [#66094](https://github.com/saltstack/salt/issues/66094)
+
+  # Security
+
+  * Bump to ``cryptography==42.0.0`` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
+
+    In the process, we were also required to update to ``pyOpenSSL==24.0.0`` [#66004](https://github.com/saltstack/salt/issues/66004)
+  * Bump to `cryptography==42.0.3` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f [#66090](https://github.com/saltstack/salt/issues/66090)
+
+
+ -- Salt Project Packaging <saltproject-packaging@vmware.com>  Tue, 20 Feb 2024 21:54:35 +0000
+
 salt (3006.6) stable; urgency=medium


--- a/pkg/rpm/salt.spec
+++ b/pkg/rpm/salt.spec
@ -646,6 +646,57 @@ if [ $1 -ge 1 ] ; then
 fi

 %changelog
+* Tue Feb 20 2024 Salt Project Packaging <saltproject-packaging@vmware.com> - 3006.7
+
+# Deprecated
+
+- Deprecate and stop using ``salt.features`` [#65951](https://github.com/saltstack/salt/issues/65951)
+
+# Changed
+
+- Change module search path priority, so Salt extensions can be overridden by syncable modules and module_dirs. You can switch back to the old logic by setting features.enable_deprecated_module_search_path_priority to true, but it will be removed in Salt 3008. [#65938](https://github.com/saltstack/salt/issues/65938)
+
+# Fixed
+
+- Fix an issue with mac_shadow that was causing a command execution error when
+  retrieving values that were not yet set. For example, retrieving last login
+  before the user had logged in. [#34658](https://github.com/saltstack/salt/issues/34658)
+- Fixed an issue when keys didn't match because of line endings [#52289](https://github.com/saltstack/salt/issues/52289)
+- Corrected encoding of credentials for use with Artifactory [#63063](https://github.com/saltstack/salt/issues/63063)
+- Use `send_multipart` instead of `send` when sending multipart message. [#65018](https://github.com/saltstack/salt/issues/65018)
+- Fix an issue where the minion would crash on Windows if some of the grains
+  failed to resolve [#65154](https://github.com/saltstack/salt/issues/65154)
+- Fix issue with openscap when the error was outside the expected scope. It now
+  returns failed with the error code and the error [#65193](https://github.com/saltstack/salt/issues/65193)
+- Upgrade relenv to 0.15.0 to fix namespaced packages installed by salt-pip [#65433](https://github.com/saltstack/salt/issues/65433)
+- Fix regression of fileclient re-use when rendering sls pillars and states [#65450](https://github.com/saltstack/salt/issues/65450)
+- Fixes the s3fs backend computing the local cache's files with the wrong hash type [#65589](https://github.com/saltstack/salt/issues/65589)
+- Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration [#65670](https://github.com/saltstack/salt/issues/65670)
+- Fix boto execution module loading [#65691](https://github.com/saltstack/salt/issues/65691)
+- Removed PR 65185 changes since incomplete solution [#65692](https://github.com/saltstack/salt/issues/65692)
+- catch only ret/ events not all returning events. [#65727](https://github.com/saltstack/salt/issues/65727)
+- Fix nonsensical time in fileclient timeout error. [#65752](https://github.com/saltstack/salt/issues/65752)
+- Fixes an issue when reading/modifying ini files that contain unicode characters [#65777](https://github.com/saltstack/salt/issues/65777)
+- added https proxy to the list of proxies so that requests knows what to do with https based proxies [#65824](https://github.com/saltstack/salt/issues/65824)
+- Ensure minion channels are closed on any master connection error. [#65932](https://github.com/saltstack/salt/issues/65932)
+- Fixed issue where Salt can't find libcrypto when pip installed from a cloned repo [#65954](https://github.com/saltstack/salt/issues/65954)
+- Fix RPM package systemd scriptlets to make RPM packages more universal [#65987](https://github.com/saltstack/salt/issues/65987)
+- Fixed an issue where fileclient requests during Pillar rendering cause
+  fileserver backends to be needlessly refreshed. [#65990](https://github.com/saltstack/salt/issues/65990)
+- Fix exceptions being set on futures that are already done in ZeroMQ transport [#66006](https://github.com/saltstack/salt/issues/66006)
+- Use hmac compare_digest method in hashutil module to mitigate potential timing attacks [#66041](https://github.com/saltstack/salt/issues/66041)
+- Fix request channel default timeout regression. In 3006.5 it was changed from
+  60 to 30 and is now set back to 60 by default. [#66061](https://github.com/saltstack/salt/issues/66061)
+- Upgrade relenv to 0.15.1 to fix debugpy support. [#66094](https://github.com/saltstack/salt/issues/66094)
+
+# Security
+
+- Bump to ``cryptography==42.0.0`` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
+
+  In the process, we were also required to update to ``pyOpenSSL==24.0.0`` [#66004](https://github.com/saltstack/salt/issues/66004)
+- Bump to `cryptography==42.0.3` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f [#66090](https://github.com/saltstack/salt/issues/66090)
+
+
 * Fri Jan 26 2024 Salt Project Packaging <saltproject-packaging@vmware.com> - 3006.6

 # Changed
				`@ -1 +0,0 @@`
				`Fixed an issue when keys didn't match because of line endings`
				`@ -1 +0,0 @@`
				`Corrected encoding of credentials for use with Artifactory`
				`@ -1 +0,0 @@`
				Use `send_multipart` instead of `send` when sending multipart message.
				`@ -1 +0,0 @@`
				`Fix regression of fileclient re-use when rendering sls pillars and states`
				`@ -1 +0,0 @@`
				`Fixes the s3fs backend computing the local cache's files with the wrong hash type`
				`@ -1 +0,0 @@`
				`Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration`
				`@ -1 +0,0 @@`
				`Removed PR 65185 changes since incomplete solution`
				`@ -1 +0,0 @@`
				`catch only ret/ events not all returning events.`
				`@ -1 +0,0 @@`
				`Fix nonsensical time in fileclient timeout error.`
				`@ -1 +0,0 @@`
				`Fixes an issue when reading/modifying ini files that contain unicode characters`