gentoo auto-resync : 28:08:2024 - 12:00:19

4 files changed, 19 insertions, 3 deletions

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 6f78b9dd92bd..b7a99b21154c 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -13,6 +13,7 @@ AUX salt-3005.1-modules-file-python-3.11-host.patch 4206 BLAKE2B 9cd3cb68b5c1a95
 AUX salt-3005.1-no-entry-points.patch 428 BLAKE2B 1bcf3b070afd01c56985290051a3cb031d5ca83b42631eba5f05d7648eabf13bca44573811b767d739dc9bc6d0a5da6f99de87b57c678df79cc172fa6dd5495f SHA512 ed5712689a6d39da9c6a67f28a48d35bbd271a6a3b898cbb0e0493e1813cc99e64388fb60707e6fee95691e339336c2656278780115b39d285c380ded92fe3cb
 AUX salt-3005.1-tests.patch 2367 BLAKE2B 467af423de22b4ddeb80fef3d4682976283116698b7c2551c4710e049d8ad7749a4eb07c541a427ed540fdea6a0e4f4e63d96988bafd92974cc3b1026e27fd03 SHA512 4ba3c36be9de377848880819fc4bacf72978a12e483bea90a4e5e7524d7212b5d554302000f6c628156ec5aafbf48d662dec2764d96253be74fa202c73e7fc67
 AUX salt-3006.2-tests.patch 3598 BLAKE2B 5e8f8df73e905aa1807b6bdeed2f95bd5b12623beb368123091e5f9733dc81d7564b00b308232baa0603feb047ad693581648341e72ab2d263b438d12cc6c916 SHA512 c4dde9a456adfe70ebaf0ebdc8c1dd532e41c603a148ee15720f520f8366738d4fb4e0b6b27a6164ddf4d34d1e9d398c3299aaf3945fbba97c250b38e2dcacec
+AUX salt-3006.9-pam-module.patch 715 BLAKE2B df603eb8a623c813849844a34baffcd41e41df416eee630c426b0ce68ed611db1a5f9394f475eecfb135cf3bca00e1491f8866ac216b0ba33a698029fc188699 SHA512 8adc8d8028811697e36119a2ced87371991c1b25adeb9a122097bf625294ce43ca8235830ff574004c3eaa6c058c3d5c122d49bb1bb6ab136e907c4cd0957905
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@@ -28,7 +29,7 @@ DIST salt-3007.1.tar.gz 19401831 BLAKE2B ea8c89a24991467367dc0c50e3d2f864e2f6211
 EBUILD salt-3005.5-r1.ebuild 12562 BLAKE2B 353e88ebd0c8992826ed030f2cd89bba882e1ea74239276d7f81d904ba27b91e1c4e5b5586bfbc1b16c6446de5f22610e14992b72fa7c5a6d56d3a002e4455c4 SHA512 86392b47a9e0d52a4186416550b75f7ea701355e970efcd1af4cbf27d0cf6f4025de0b6364998e712daca357761e8cd5e65a604ad605d29395231b6193943ea4
 EBUILD salt-3006.5-r1.ebuild 15196 BLAKE2B beb3924f91cf050c2a57414e0121d08c54991c2aa1b5c89a1c67afa644c1ef030415dc588b36e6aa11adf651d851f82365b4d5ccfa27e043c707756ddfe4c6c8 SHA512 c4b1d4a50546196f75c9d1327aa13bb649a61349b52f60b91cc958ad5bfcb1c438042c29d513a94aebb9f92d4d5acc47438d4e34468701e840ca0a0e52f7805e
 EBUILD salt-3006.7-r1.ebuild 15501 BLAKE2B 0de15bea8e2c92b5fe242137604e7bf09555cd054b4a0ef04026b388830ac2b797a51e3c541f43dc40723c0790c9f414f165d6ec950cc247e01c07d594a835e8 SHA512 85bb4881135999701972f2105ed185475c50a62ffe50361bd9842f2603582d9cb0eb2c2b6044ae2227b2f8430662b6e84a7b5a1890cb3c1427e709fedd428b63
-EBUILD salt-3006.9.ebuild 19210 BLAKE2B 3547b1e65be906860d0518d692a4329b91948aacf003530a2def960c7fe5c32f1a6d382203ea7891c38c01dc7d62bb916840b6f8878df73a0ec8dbfe85b07f7e SHA512 35ca63b6bb9ade6395c7eac746234b077ff20ed018e0e022def8e50e036feedadb33c88709f95b6c9e13f06d4db667222a00d8d3575b46937eae6e9704ba85ec
+EBUILD salt-3006.9-r2.ebuild 19255 BLAKE2B 303a0b3de340db2efca419618f23989201706ef4e7b1d551d47f759adbb3a1fbedf24918073bcaefbd22f7404cda82ffe13d0eac75c8231646d0d2ab5e4601d3 SHA512 3f147a05d1f43f67b89314558794fd33d5a704128aa8a76357af45cb7611caee0272ac622f6f85ad3f608655cd46c664a0de560bc51ad0edbe1014c032fb0412
 EBUILD salt-3007.0-r1.ebuild 30876 BLAKE2B 2816e84e757e2076c2c81aa9de3b6984e3567de44a1219dae131c110b5b9b54b9f3c41ac54f0a99e0813bc8347c412948affba56b8e38917b393b81878247034 SHA512 0fdb640a921418059800c9f86d29d4495ef489e607dfcb54baffc7071e22898b9ed5ffbd823641fd0459b1c355bf87aff64f0f65635047a8b1d90c5b5f4e0ae2
-EBUILD salt-3007.1.ebuild 30929 BLAKE2B 07fd76ca5eff01bf95ec9c071ba0470af80fdb9ff5457eed2490ec2750d02881df85738e6bc6266f7431bf979408d3272e6493d3b9cfe75286df53b2c10c4ced SHA512 e0dcb1413b967bfe9b85d39333baf86075763a931b5b0c0e680967f83920cd4d7029dc31ea94b880b3e04f42548f9ee74112bf15de825bf3d5e5b8954cd8d215
+EBUILD salt-3007.1-r1.ebuild 30973 BLAKE2B dd6ffb0a671b10da0f5303f8e23be6ce33731370ea3ab29d1210268a92d18774b38a0669c8a3765a35966fb4e6f19d96e45579e1c44210a735d789966669a2af SHA512 a038b37f7f8f46ffa6138ac143605d1825832143fc827a639c8d10d0c18052d528cab16dab5fb52b400b0296d7b00279bd71fa9f60ec78cb51be016b033da700
 MISC metadata.xml 2244 BLAKE2B 2c67e0828b71051c1c542b1e2142d93d623c28f30e36b59442dda3966f18ef2ae1111a263f1faf56c288c927c7db13736cfa68111248e84378fab23043d49e02 SHA512 89e46a1379b2cf95aff0af082f989cb50a1a769240407fbe6a43de1a3f312be5b690f30d1349aa659268fcf3818a2d829fcff18fd11988b161038cb19e13bde5
diff --git a/app-admin/salt/files/salt-3006.9-pam-module.patch b/app-admin/salt/files/salt-3006.9-pam-module.patch
new file mode 100644
index 000000000000..c0af2ee5210f
--- /dev/null
+++ b/app-admin/salt/files/salt-3006.9-pam-module.patch
@@ -0,0 +1,13 @@
+diff --git a/salt/auth/pam.py b/salt/auth/pam.py
+index 6e179deb7c..935c523606 100644
+--- a/salt/auth/pam.py
++++ b/salt/auth/pam.py
+@@ -228,7 +228,7 @@ def authenticate(username, password):
+     env["SALT_PAM_PASSWORD"] = password
+     env["SALT_PAM_SERVICE"] = __opts__.get("auth.pam.service", "login")
+     env["SALT_PAM_ENCODING"] = __salt_system_encoding__
+-    pyexe = pathlib.Path(__opts__.get("auth.pam.python", "/usr/bin/python3")).resolve()
++    pyexe = pathlib.Path(__opts__.get("auth.pam.python", f"/usr/bin/{os.environ['EPYTHON']}")).resolve()
+     pyfile = pathlib.Path(__file__).resolve()
+     if not pyexe.exists():
+         log.error("Error 'auth.pam.python' config value does not exist: %s", pyexe)
diff --git a/app-admin/salt/salt-3006.9.ebuild b/app-admin/salt/salt-3006.9-r2.ebuild
index 4278c54ee0f5..f81dd7ade71d 100644
--- a/app-admin/salt/salt-3006.9.ebuild
+++ b/app-admin/salt/salt-3006.9-r2.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
 		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
 	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cherrypy? ( >=dev-python/cherrypy-18.6.1[${PYTHON_USEDEP}] )
 	cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
 	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
@@ -138,6 +138,7 @@ RESTRICT="!test? ( test ) x86? ( test )"
 PATCHES=(
 	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
 	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
+	"${FILESDIR}/salt-3006.9-pam-module.patch"
 )
 
 python_prepare_all() {
diff --git a/app-admin/salt/salt-3007.1.ebuild b/app-admin/salt/salt-3007.1-r1.ebuild
index d8b9533aac5e..8ff966a32715 100644
--- a/app-admin/salt/salt-3007.1.ebuild
+++ b/app-admin/salt/salt-3007.1-r1.ebuild
@@ -142,6 +142,7 @@ RESTRICT="
 
 PATCHES=(
 	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+	"${FILESDIR}/salt-3006.9-pam-module.patch"
 )
 
 python_prepare_all() {