Merge pull request #68478 from dwoz/merge/3006.x/3007.x-25-11-21

dwoz · web-flow · commit 23ec3cebea3d · 2025-11-21T17:46:14.000-07:00
Merge forward 3006.x into 3007.x
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ Versions are `MAJOR.PATCH`.
 # Changelog
 
 ## 3007.9 (2025-11-20)
+## 3006.17 (2025-11-20)
 
 
 ### Fixed
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-API" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .sp
@@ -108,7 +108,5 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 \fBsalt\-master(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-CALL" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .SH SYNOPSIS
@@ -261,7 +261,5 @@ output. Set to True or False. Default: none.
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-CLOUD" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .sp
@@ -379,7 +379,5 @@ salt\-cloud \-m /path/to/cloud.map \-Q
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-CP" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .sp
@@ -206,7 +206,5 @@ New in version 2016.3.7,2016.11.6,2017.7.0.
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-KEY" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .SH SYNOPSIS
@@ -331,7 +331,5 @@ Auto\-create a signing key\-pair if it does not yet exist
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-MASTER" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .sp
@@ -113,7 +113,5 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-MINION" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .sp
@@ -114,7 +114,5 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 \fBsalt\-master(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-PROXY" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .sp
@@ -122,7 +122,5 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-RUN" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-run \- salt-run Documentation
 .sp
@@ -119,7 +119,5 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-SSH" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-ssh \- salt-ssh Documentation
 .SH SYNOPSIS
@@ -364,7 +364,5 @@ to a JSON parser, use \fB\-\-static\fP as well.
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT-SYNDIC" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt-syndic \- salt-syndic Documentation
 .sp
@@ -115,7 +115,5 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SALT" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 salt \- salt
 .SH SYNOPSIS
@@ -353,7 +353,5 @@ to a JSON parser, use \fB\-\-static\fP as well.
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
diff --git 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 November 20, 2025 at 08:18:10 UTC." "3007.9" "Salt"
+.TH "SPM" "1" "Nov 21, 2025" "3007.9" "Salt"
 .SH NAME
 spm \- Salt Package Manager Command
 .sp
@@ -137,7 +137,5 @@ in that directory which describes them.
 \fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
-.SH COPYRIGHT
-2025
 .\" Generated by docutils manpage writer.
 .
diff --git a/doc/topics/releases/3006.17.md b/doc/topics/releases/3006.17.md
@@ -0,0 +1,60 @@
+(release-3006.17)=
+# Salt 3006.17 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
+
+### Fixed
+
+- Render post/pre up/down and hwaddr options for debian-ip. See #58210 and #57820. [#58210](https://github.com/saltstack/salt/issues/58210)
+- Fix event flood by ensuring we do not retry sending the event indefinitely to the Master of Masters. [#61845](https://github.com/saltstack/salt/issues/61845)
+- Prevent `_pygit2.GitError: error loading known_hosts` with certain pygit2/libgit2 versions. [#64121](https://github.com/saltstack/salt/issues/64121)
+- - salt-ssh now supports `state.sls_exists` (#66893) [#66893](https://github.com/saltstack/salt/issues/66893)
+- Allows file.symlink to pass a string to cmd_check [#66939](https://github.com/saltstack/salt/issues/66939)
+- Simplied and sped up `utils.json.find_json` function [#68258](https://github.com/saltstack/salt/issues/68258)
+- Improved runtime performance of chocolatey.installed [#68308](https://github.com/saltstack/salt/issues/68308)
+- Add check for vault in __opts__ var [#68312](https://github.com/saltstack/salt/issues/68312)
+- Fixed user.present not having capability to persist home directory by adding persist_home flag. [#68322](https://github.com/saltstack/salt/issues/68322)
+- Fixed pkg.installed state from showing warning if python rpm package not installed.
+  Fixed pkg.installed state from showing warning and using slow process fork for version comparison when rpmdevtools is installed [#68341](https://github.com/saltstack/salt/issues/68341)
+- Update pre-commit version used in github workflows to 4.3.0 [#68349](https://github.com/saltstack/salt/issues/68349)
+- Fixed issue with network grains in interfaces that don't support ip4 or ip6 [#68355](https://github.com/saltstack/salt/issues/68355)
+- Patch tornado for BDSA-2024-3438 [#68377](https://github.com/saltstack/salt/issues/68377)
+- Patch tornado for BDSA-2024-3439 [#68379](https://github.com/saltstack/salt/issues/68379)
+- Patch tornado for BDSA-2025-4215 [#68381](https://github.com/saltstack/salt/issues/68381)
+- Patch tornado for BDSA-2024-9026 [#68383](https://github.com/saltstack/salt/issues/68383)
+- * Update LZMA to 5.8.2
+  * Update ncurses to 6.5
+  * Update openssl to 3.5.4
+  * Fix shebang creating to work with pip >=25.2
+  * Fix python source hash checking
+  * Update to recent python versions: 3.12.12, 3.11.14, 3.10.19 and 3.9.24. [#68385](https://github.com/saltstack/salt/issues/68385)
+- Fixed the lgpo_reg error when reading REG_BINARY type data in the registry.pol
+  file. [#68387](https://github.com/saltstack/salt/issues/68387)
+- Fix leak in SaltMessageServer where the unpacker was re-used on a stream disconnect. [#68394](https://github.com/saltstack/salt/issues/68394)
+- * Upgrade relenv to 0.21.2:
+    * We refresh the ensurepip bundle during every build so new runtimes ship with pip 25.2 and setuptools 80.9.0.
+    * Windows builds now pull newer SQLite (3.50.4.0) and XZ (5.6.2) sources, copy in a missing XZ config file, and tweak SBOM metadata; the libexpat update is prepared but only runs on older maintenance releases.
+    * Our downloader helpers log more clearly, know about more archive formats, and retry cleanly on transient errors.
+    * pip’s changing install API is handled by runtime wrappers that adapt to all of the current signatures.
+    * Linux verification tests install pip 25.2/25.3 before building setuptools to make sure that flow keeps working. [#68431](https://github.com/saltstack/salt/issues/68431)
+- salt/utils/odict.py has been deprecated and will be removed in 3009. Use the standard library implementation instead. [#68440](https://github.com/saltstack/salt/issues/68440)
+- Fixed issue in cmd execution module that always return "Invalid user" for domain users. [#68450](https://github.com/saltstack/salt/issues/68450)
+- Fixed authentication protocol version downgrade vulnerability (CVE-2025-62349) by adding `minimum_auth_version` configuration option (default: 3) to prevent minions from bypassing security features through protocol downgrade attacks.
+
+  **BREAKING CHANGE:** The default value enforces authentication protocol version 3 or higher. If upgrading a deployment with older minions that do not support protocol v3, you must temporarily set `minimum_auth_version: 0` in the master configuration before upgrading the master, then upgrade all minions before removing this override. [#68467](https://github.com/saltstack/salt/issues/68467)
+- Fixed unsafe YAML loader usage in junos execution module (CVE-2025-62348) [#68469](https://github.com/saltstack/salt/issues/68469)
diff --git a/doc/topics/releases/templates/3006.17.md.template b/doc/topics/releases/templates/3006.17.md.template
@@ -0,0 +1,14 @@
+(release-3006.17)=
+# Salt 3006.17 release notes{{ unreleased }}
+{{ warning }}
+
+<!--
+Add release specific details below
+-->
+
+<!--
+Do not edit the changelog below.
+This is auto generated.
+-->
+## Changelog
+{{ changelog }}
diff --git a/salt/netapi/rest_wsgi.py b/salt/netapi/rest_wsgi.py
@@ -65,6 +65,7 @@
 ==============
 
 .. http:post:: /
+    :noindex:
 
     **Example request** for a basic ``test.ping``::
 
