Merge pull request saltstack#65699 from s0undt3ch/hotfix/merge-forward

[master] Merge 3006.x into master
jynolen · Dec 15, 2023 · cd12ba1 · cd12ba1
2 parents 84f434c + a43f550
commit cd12ba1
Show file tree

Hide file tree

Showing 199 changed files with 10,782 additions and 8,899 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -139,6 +139,8 @@ jobs:
             arch: x86
           - platform: darwin
             arch: x86_64
+          - platform: darwin
+            arch: aarch64
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja
@@ -173,6 +173,8 @@ permissions:
             arch: x86
           - platform: darwin
             arch: x86_64
+          - platform: darwin
+            arch: aarch64
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml
@@ -122,15 +122,15 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: salt-${{ inputs.salt-version }}-${{ inputs.arch }}-${{ inputs.pkg-type }}
-          path: pkg/artifacts/
+          path: artifacts/pkg/
 
       - name: Install System Dependencies
         run: |
           brew install tree
 
       - name: List Packages
         run: |
-          tree pkg/artifacts
+          tree artifacts/pkg/
 
       - name: Download Onedir Tarball as an Artifact
         uses: actions/download-artifact@v3
@@ -214,6 +214,7 @@ jobs:
           name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ matrix.tests-chunk }}
           path: |
             artifacts
+            !artifacts/pkg/*
             !artifacts/salt/*
             !artifacts/salt-*.tar.*
 

diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml
@@ -133,7 +133,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-${{ inputs.arch }}-${{ inputs.pkg-type }}
-          path: pkg/artifacts/
+          path: artifacts/pkg/
 
       - name: Download Onedir Tarball as an Artifact
         uses: actions/download-artifact@v3
@@ -150,7 +150,7 @@ jobs:
 
       - name: List Packages
         run: |
-          tree pkg/artifacts
+          tree artifacts/pkg/
 
       - name: Download cached nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
         uses: actions/[email protected]
@@ -230,6 +230,7 @@ jobs:
           name: pkg-testrun-artifacts-${{ inputs.distro-slug }}-${{ matrix.tests-chunk }}
           path: |
             artifacts
+            !artifacts/pkg/*
             !artifacts/salt/*
             !artifacts/salt-*.tar.*
 

diff --git a/.gitignore b/.gitignore
@@ -119,7 +119,6 @@ kitchen.local.yml
 .bundle/
 Gemfile.lock
 /artifacts/
-/pkg/artifacts/
 requirements/static/*/py*/*.log
 
 # Vim's default session file

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,83 @@ Versions are `MAJOR.PATCH`.
 
 # Changelog
 
+## 3006.5 (2023-12-12)
+
+
+### Removed
+
+- Tech Debt - support for pysss removed due to functionality addition in Python 3.3 [#65029](https://github.com/saltstack/salt/issues/65029)
+
+
+### Fixed
+
+- Improved error message when state arguments are accidentally passed as a string [#38098](https://github.com/saltstack/salt/issues/38098)
+- Allow `pip.install` to create a log file that is passed in if the parent directory is writeable [#44722](https://github.com/saltstack/salt/issues/44722)
+- Fixed merging of complex pillar overrides with salt-ssh states [#59802](https://github.com/saltstack/salt/issues/59802)
+- Fixed gpg pillar rendering with salt-ssh [#60002](https://github.com/saltstack/salt/issues/60002)
+- Made salt-ssh states not re-render pillars unnecessarily [#62230](https://github.com/saltstack/salt/issues/62230)
+- Made Salt maintain options in Debian package repo definitions [#64130](https://github.com/saltstack/salt/issues/64130)
+- Migrated all [`invoke`](https://www.pyinvoke.org/) tasks to [`python-tools-scripts`](https://github.com/s0undt3ch/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` [#64374](https://github.com/saltstack/salt/issues/64374)
+- Fix salt user login shell path in Debian packages [#64377](https://github.com/saltstack/salt/issues/64377)
+- Fill out lsb_distrib_xxxx (best estimate) grains if problems with retrieving lsb_release data [#64473](https://github.com/saltstack/salt/issues/64473)
+- Fixed an issue in the ``file.directory`` state where the ``children_only`` keyword
+  argument was not being respected. [#64497](https://github.com/saltstack/salt/issues/64497)
+- Move salt.ufw to correct location /etc/ufw/applications.d/ [#64572](https://github.com/saltstack/salt/issues/64572)
+- Fixed salt-ssh stacktrace when retcode is not an integer [#64575](https://github.com/saltstack/salt/issues/64575)
+- Fixed SSH shell seldomly fails to report any exit code [#64588](https://github.com/saltstack/salt/issues/64588)
+- Fixed some issues in x509_v2 execution module private key functions [#64597](https://github.com/saltstack/salt/issues/64597)
+- Fixed grp.getgrall() in utils/user.py causing performance issues [#64888](https://github.com/saltstack/salt/issues/64888)
+- Fix user.list_groups omits remote groups via sssd, etc. [#64953](https://github.com/saltstack/salt/issues/64953)
+- Ensure sync from _grains occurs before attempting pillar compilation in case custom grain used in pillar file [#65027](https://github.com/saltstack/salt/issues/65027)
+- Moved gitfs locks to salt working dir to avoid lock wipes [#65086](https://github.com/saltstack/salt/issues/65086)
+- Only attempt to create a keys directory when `--gen-keys` is passed to the `salt-key` CLI [#65093](https://github.com/saltstack/salt/issues/65093)
+- Fix nonce verification, request server replies do not stomp on eachother. [#65114](https://github.com/saltstack/salt/issues/65114)
+- speed up yumpkg list_pkgs by not requiring digest or signature verification on lookup. [#65152](https://github.com/saltstack/salt/issues/65152)
+- Fix pkg.latest failing on windows for winrepo packages where the package is already up to date [#65165](https://github.com/saltstack/salt/issues/65165)
+- 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. [#65179](https://github.com/saltstack/salt/issues/65179)
+- Fixes traceback when state id is an int in a reactor SLS file. [#65210](https://github.com/saltstack/salt/issues/65210)
+- 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. [#65231](https://github.com/saltstack/salt/issues/65231)
+- Use ``sha256`` as the default ``hash_type``. It has been the default since Salt v2016.9 [#65287](https://github.com/saltstack/salt/issues/65287)
+- Preserve ownership on log rotation [#65288](https://github.com/saltstack/salt/issues/65288)
+- Ensure that the correct value of jid_inclue is passed if the argument is included in the passed keyword arguments. [#65302](https://github.com/saltstack/salt/issues/65302)
+- 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. [#65316](https://github.com/saltstack/salt/issues/65316)
+- Fix regex for filespec adding/deleting fcontext policy in selinux [#65340](https://github.com/saltstack/salt/issues/65340)
+- Ensure CLI options take priority over Saltfile options [#65358](https://github.com/saltstack/salt/issues/65358)
+- Test mode for state function `saltmod.wheel` no longer set's `result` to `(None,)` [#65372](https://github.com/saltstack/salt/issues/65372)
+- Client only process events which tag conforms to an event return. [#65400](https://github.com/saltstack/salt/issues/65400)
+- Fixes an issue setting user or machine policy on Windows when the Group Policy
+  directory is missing [#65411](https://github.com/saltstack/salt/issues/65411)
+- Fix regression in file module which was not re-using a file client. [#65450](https://github.com/saltstack/salt/issues/65450)
+- pip.installed state will now properly fail when a specified user does not exists [#65458](https://github.com/saltstack/salt/issues/65458)
+- Publish channel connect callback method properly closes it's request channel. [#65464](https://github.com/saltstack/salt/issues/65464)
+- Ensured the pillar in SSH wrapper modules is the same as the one used in template rendering when overrides are passed [#65483](https://github.com/saltstack/salt/issues/65483)
+- Fix file.comment ignore_missing not working with multiline char [#65501](https://github.com/saltstack/salt/issues/65501)
+- Warn when an un-closed transport client is being garbage collected. [#65554](https://github.com/saltstack/salt/issues/65554)
+- Only generate the HMAC's for ``libssl.so.1.1`` and ``libcrypto.so.1.1`` if those files exist. [#65581](https://github.com/saltstack/salt/issues/65581)
+- Fixed an issue where Salt Cloud would fail if it could not delete lingering
+  PAexec binaries [#65584](https://github.com/saltstack/salt/issues/65584)
+
+
+### Added
+
+- Added Salt support for Debian 12 [#64223](https://github.com/saltstack/salt/issues/64223)
+- Added Salt support for Amazon Linux 2023 [#64455](https://github.com/saltstack/salt/issues/64455)
+
+
+### Security
+
+- Bump to `cryptography==41.0.4` due to https://github.com/advisories/GHSA-v8gr-m533-ghj9 [#65268](https://github.com/saltstack/salt/issues/65268)
+- Bump to `cryptography==41.0.7` due to https://github.com/advisories/GHSA-jfhm-5ghh-2f97 [#65643](https://github.com/saltstack/salt/issues/65643)
+
 
 ## 3006.4 (2023-10-16)
 

diff --git a/changelog/38098.fixed.md b/changelog/38098.fixed.md
diff --git a/changelog/44722.fixed.md b/changelog/44722.fixed.md
diff --git a/changelog/59802.fixed.md b/changelog/59802.fixed.md
diff --git a/changelog/60002.fixed.md b/changelog/60002.fixed.md
diff --git a/changelog/62230.fixed.md b/changelog/62230.fixed.md
diff --git a/changelog/64130.fixed.md b/changelog/64130.fixed.md
diff --git a/changelog/64223.added.md b/changelog/64223.added.md
diff --git a/changelog/64374.fixed.md b/changelog/64374.fixed.md
diff --git a/changelog/64377.fixed.md b/changelog/64377.fixed.md
diff --git a/changelog/64455.added.md b/changelog/64455.added.md
diff --git a/changelog/64473.fixed.md b/changelog/64473.fixed.md
diff --git a/changelog/64497.fixed.md b/changelog/64497.fixed.md
diff --git a/changelog/64572.fixed.md b/changelog/64572.fixed.md
diff --git a/changelog/64575.fixed.md b/changelog/64575.fixed.md
diff --git a/changelog/64588.fixed.md b/changelog/64588.fixed.md
diff --git a/changelog/64597.fixed.md b/changelog/64597.fixed.md
diff --git a/changelog/64888.fixed.md b/changelog/64888.fixed.md
diff --git a/changelog/64953.fixed.md b/changelog/64953.fixed.md
diff --git a/changelog/65027.fixed.md b/changelog/65027.fixed.md
diff --git a/changelog/65029.removed.md b/changelog/65029.removed.md
diff --git a/changelog/65086.fixed.md b/changelog/65086.fixed.md
diff --git a/changelog/65093.fixed.md b/changelog/65093.fixed.md
diff --git a/changelog/65114.fixed.md b/changelog/65114.fixed.md
diff --git a/changelog/65152.fixed.md b/changelog/65152.fixed.md
diff --git a/changelog/65165.fixed.md b/changelog/65165.fixed.md
diff --git a/changelog/65179.fixed.md b/changelog/65179.fixed.md
diff --git a/changelog/65193.fixed.md b/changelog/65193.fixed.md
@@ -0,0 +1,2 @@
+Fix issue with openscap when the error was outside the expected scope. It now
+returns failed with the error code and the error
diff --git a/changelog/65210.fixed.md b/changelog/65210.fixed.md
diff --git a/changelog/65231.fixed.md b/changelog/65231.fixed.md
diff --git a/changelog/65268.security.md b/changelog/65268.security.md
diff --git a/changelog/65287.fixed.md b/changelog/65287.fixed.md
diff --git a/changelog/65288.fixed.md b/changelog/65288.fixed.md
diff --git a/changelog/65302.fixed.md b/changelog/65302.fixed.md
diff --git a/changelog/65316.fixed.md b/changelog/65316.fixed.md
diff --git a/changelog/65340.fixed.md b/changelog/65340.fixed.md
diff --git a/changelog/65358.fixed.md b/changelog/65358.fixed.md
diff --git a/changelog/65372.fixed.md b/changelog/65372.fixed.md
diff --git a/changelog/65400.fixed.md b/changelog/65400.fixed.md
diff --git a/changelog/65411.fixed.md b/changelog/65411.fixed.md
diff --git a/changelog/65450.fixed.md b/changelog/65450.fixed.md
diff --git a/changelog/65458.fixed.md b/changelog/65458.fixed.md
diff --git a/changelog/65464.fixed.md b/changelog/65464.fixed.md
diff --git a/changelog/65483.fixed.md b/changelog/65483.fixed.md
diff --git a/changelog/65501.fixed.md b/changelog/65501.fixed.md
diff --git a/changelog/65554.fixed.md b/changelog/65554.fixed.md
diff --git a/changelog/65581.fixed.md b/changelog/65581.fixed.md
diff --git a/changelog/65584.fixed.md b/changelog/65584.fixed.md
diff --git a/changelog/65643.security.md b/changelog/65643.security.md
diff --git a/changelog/65670.fixed.md b/changelog/65670.fixed.md
@@ -0,0 +1 @@
+Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration
diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-API" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .sp

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-CALL" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .SH SYNOPSIS

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-CLOUD" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .sp

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-CP" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .sp

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-KEY" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .SH SYNOPSIS

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-MASTER" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .sp

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-MINION" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .sp

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-PROXY" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .sp

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-RUN" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-run \- salt-run Documentation
 .sp

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-SSH" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-ssh \- salt-ssh Documentation
 .SH SYNOPSIS

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT-SYNDIC" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt-syndic \- salt-syndic Documentation
 .sp

diff --git 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 October 16, 2023 at 05:24:47 PM UTC." "3006.4" "Salt"
+.TH "SALT" "1" "Generated on December 12, 2023 at 05:54:17 PM UTC." "3006.5" "Salt"
 .SH NAME
 salt \- salt
 .SH SYNOPSIS
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fix issue with openscap when the error was outside the expected scope. It now
		returns failed with the error code and the error
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration