Update release notes and man pages for 3003.5

Megan Wilhite · Megan Wilhite · commit 683b21b56829 · 2022-05-24T13:36:08.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,23 @@ Versions are `MAJOR.PATCH`.
 
 # Changelog
 
+Salt 3003.5 (2022-07-05)
+========================
+
+Fixed
+-----
+
+- Update Markup and contextfunction imports for jinja versions >=3.1. (#61848)
+- Fix bug in tcp transport (#61865)
+- Make sure the correct key is being used when verifying or validating communication, eg. when a Salt syndic is involved use syndic_master.pub and when a Salt minion is involved use minion_master.pub. (#61868)
+
+
+Security
+--------
+
+- Fixed PAM auth to reject auth attempt if user account is locked. (cve-2022-22967)
+
+
 Salt 3003.4 (2022-02-25)
 ========================
 
diff --git a/changelog/61848.fixed b/changelog/61848.fixed
diff --git a/changelog/61865.fixed b/changelog/61865.fixed
diff --git a/changelog/61868.fixed b/changelog/61868.fixed
diff --git a/changelog/cve-2022-22967.security b/changelog/cve-2022-22967.security
diff --git a/doc/man/salt-api.1 b/doc/man/salt-api.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-API" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .
diff --git a/doc/man/salt-call.1 b/doc/man/salt-call.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CALL" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-CALL" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .
diff --git a/doc/man/salt-cloud.1 b/doc/man/salt-cloud.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CLOUD" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-CLOUD" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .
diff --git a/doc/man/salt-cp.1 b/doc/man/salt-cp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CP" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-CP" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .
diff --git a/doc/man/salt-key.1 b/doc/man/salt-key.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-KEY" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-KEY" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .
diff --git a/doc/man/salt-master.1 b/doc/man/salt-master.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MASTER" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-MASTER" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .
diff --git a/doc/man/salt-minion.1 b/doc/man/salt-minion.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MINION" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-MINION" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .
diff --git a/doc/man/salt-proxy.1 b/doc/man/salt-proxy.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-PROXY" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-PROXY" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .
diff --git a/doc/man/salt-run.1 b/doc/man/salt-run.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-RUN" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-RUN" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-run \- salt-run Documentation
 .
diff --git a/doc/man/salt-ssh.1 b/doc/man/salt-ssh.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SSH" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-SSH" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-ssh \- salt-ssh Documentation
 .
diff --git a/doc/man/salt-syndic.1 b/doc/man/salt-syndic.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SYNDIC" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-SYNDIC" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-syndic \- salt-syndic Documentation
 .
diff --git a/doc/man/salt-unity.1 b/doc/man/salt-unity.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-UNITY" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT-UNITY" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt-unity \- salt-unity Command
 .
diff --git a/doc/man/salt.1 b/doc/man/salt.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT" "1" "Feb 25, 2022" "3003.4" "Salt"
+.TH "SALT" "1" "May 24, 2022" "3003.5" "Salt"
 .SH NAME
 salt \- salt
 .
diff --git a/doc/man/salt.7 b/doc/man/salt.7
diff --git a/doc/man/spm.1 b/doc/man/spm.1
diff --git a/doc/topics/releases/3003.5.rst b/doc/topics/releases/3003.5.rst

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-API" "1" "Feb 25, 2022" "3003.4" "Salt"`
	`3`	`+.TH "SALT-API" "1" "May 24, 2022" "3003.5" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-api \- salt-api Command`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-CALL" "1" "Feb 25, 2022" "3003.4" "Salt"`
	`3`	`+.TH "SALT-CALL" "1" "May 24, 2022" "3003.5" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-call \- salt-call Documentation`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-CLOUD" "1" "Feb 25, 2022" "3003.4" "Salt"`
	`3`	`+.TH "SALT-CLOUD" "1" "May 24, 2022" "3003.5" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-cloud \- Salt Cloud Command`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-CP" "1" "Feb 25, 2022" "3003.4" "Salt"`
	`3`	`+.TH "SALT-CP" "1" "May 24, 2022" "3003.5" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-cp \- salt-cp Documentation`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-KEY" "1" "Feb 25, 2022" "3003.4" "Salt"`
	`3`	`+.TH "SALT-KEY" "1" "May 24, 2022" "3003.5" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-key \- salt-key Documentation`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-MASTER" "1" "Feb 25, 2022" "3003.4" "Salt"`
	`3`	`+.TH "SALT-MASTER" "1" "May 24, 2022" "3003.5" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-master \- salt-master Documentation`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-MINION" "1" "Feb 25, 2022" "3003.4" "Salt"`
	`3`	`+.TH "SALT-MINION" "1" "May 24, 2022" "3003.5" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-minion \- salt-minion Documentation`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-PROXY" "1" "Feb 25, 2022" "3003.4" "Salt"`
	`3`	`+.TH "SALT-PROXY" "1" "May 24, 2022" "3003.5" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-proxy \- salt-proxy Documentation`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-RUN" "1" "Feb 25, 2022" "3003.4" "Salt"`
	`3`	`+.TH "SALT-RUN" "1" "May 24, 2022" "3003.5" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-run \- salt-run Documentation`
`6`	`6`	`.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.\" Man page generated from reStructuredText.`
`2`	`2`	`.`
`3`		`-.TH "SALT-SSH" "1" "Feb 25, 2022" "3003.4" "Salt"`
	`3`	`+.TH "SALT-SSH" "1" "May 24, 2022" "3003.5" "Salt"`
`4`	`4`	`.SH NAME`
`5`	`5`	`salt-ssh \- salt-ssh Documentation`
`6`	`6`	`.`