gentoo auto-resync : 09:01:2024 - 01:01:10

6 files changed, 37 insertions, 3 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index f5399b675075..4910b8a722ac 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index c5d007466bf4..4b783fe13e57 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -6,6 +6,7 @@ AUX nvidia-drivers-390.154-clang15-x86.patch 1085 BLAKE2B 5bb221407b280f2dde69ef
 AUX nvidia-drivers-390.154-clang15.patch 2915 BLAKE2B e9799aee3c6b814ecdc40e83d2e495acad046f18c88fe8c1b5fead1c9cd0fab3d0a0a2924730dadec5eb8ea1e2d2132c495298d6ab108c015721bab911a4da79 SHA512 6e1c99ae8efb06aa4fc3accb4cee55f43a6498f94fca064fd4b9b007a3555913a5cef042d4e74b6f24a3eb6f14988f810d0c848d34ae81835fbae8ec32cf0cf0
 AUX nvidia-drivers-470.141.03-clang15.patch 3757 BLAKE2B 9cec15b57c82c8e24f89a025a73bf78e3d7ea5df681cf803888ca4ad8b96976b433717d01c9fdad5036cb06376345bef64dd05287791ed0ce7dc2a06c8a79aab SHA512 10ed0fa6b1fdf24fbc18432a9b94b1c1b9d7d6003926272d3c924d72a298c1d3a8875b43a42472d701864fe9dda35d75f9cf7c51ca841d20b989ed46ed994311
 AUX nvidia-drivers-525.116.04-clang-unused-option.patch 883 BLAKE2B 264cd7cf7972b686a8096c13c8e6b9cdcc8b0c32995de476482a597041160c347793ad7ef53d9d214df64c48d6e87995543e625ebace8a09845bcbc34063f529 SHA512 58f8c7b505ef4195ef0211bc06e5220fec58fa4c25ca61f45f79742516895d9339fd8ecf8abba767abf7bec121d9a6c9a539c9ac6b16fd12a25805df9fda5ae7
+AUX nvidia-drivers-535.43.22-kernel-6.7.patch 1485 BLAKE2B 06f0d46a03b4b07f906f057b06b93e56f0841118a48f74ff9d8cc15adc78e2d2a34d5bb8a63808099ef54286ea08816a69040953326c14dec04828054af6ab59 SHA512 9343294014917086b61dc72b091a7840f2a4fa929846e1554d201e38c3bc2d82b2d022e693045134eb8a52955e8df1dd3d65947f68ea8f294e6d69a23805da54
 AUX nvidia-drm-outputclass-390.conf 179 BLAKE2B 2a7d3bb2bb131db6ddf24c9fa157a1044e72a3229088654f4768f76eb871cdaacdee58e82be5504c1c0af928c343448b4d03f23d289a4479b64218d57fbd7a16 SHA512 8e5dfe54b9cf261d28c206ca1594183cba4945ed633a13ab4b1801b2ad4614ca10038ab7f0cf35dbf4eaa7b2de6e747c3be13ecb11d05740b22654626f09d774
 AUX nvidia-kernel-module-source-515.86.01-raw-ldflags.patch 628 BLAKE2B da490e4af1c898958df0ef656914e8bba3f7236fb1d2f94420a42d895d7f47ddc9cc173ef3b4b29f80ac880266767d54e76613dfc3defb1d4fe3f2b48377a71b SHA512 0a972c4efd219ddc8e814753c7c2bdea8fd0f0f3d2255bd0f9a4baab2a96319c8238cc027f602e399be9521467e110cffb1e0ee6b90f38867df49cd4c3b11c5d
 AUX nvidia-modprobe-390.141-uvm-perms.patch 563 BLAKE2B 9befd708ad2193e507583e066f306e11d55e82912f456e738d850b804d35331df2ca5de3a35e8ab551188c1103af762941098639fa9581b4437bc5e68595ddd6 SHA512 0546d51a86554985cd7cc036e7b8f65b457cd1a1c0549ef496422fa422d2757354a47b83247b100597f908c2653314878c721b3918ebc529cae4282824d4eada
@@ -58,7 +59,7 @@ DIST open-gpu-kernel-modules-535.43.22.tar.gz 12738048 BLAKE2B 066625414f370fc1b
 EBUILD nvidia-drivers-390.157.ebuild 14114 BLAKE2B 7b4f016ba4e5fb28f2c90d6566c72425d70e3bf49d13a1795f39084c9fb056002e61b5d88ca2876575a7cb29bb106cb1510e5aaeff60a0daf351e089d3531dcc SHA512 e0e3ca291447a36f17681ffa8b7f2fa7f4870a45bc2dbf33740443fa4fcab37fed26c6bf7fa81492b609ed867f832a5712d699d1da3945e1350c605955dc4de1
 EBUILD nvidia-drivers-470.223.02.ebuild 14770 BLAKE2B 2bdc7aa1fa104f3e035037408aeebe3eb65ac0ba62a3782eafbd22035ce7deda05487bb36908940cb7370561522cb8fde5953bff57baab63b519e3eb2aeb2692 SHA512 6e98fbe36281acb295ab1db7d947973e43997482e400c3817453101ca5410a1e90211be4787cca070af96f493cd86dcf2d66d15017cf41542492995388223012
 EBUILD nvidia-drivers-525.147.05.ebuild 17059 BLAKE2B f2bbc0338968ea6d5c7555dffca9d21a7d64bff98fdf95e4934bd0795739707ee4bd3d068c29df2db900cd4fd8f906d429e38e8a98940958857d57c2077c76bd SHA512 607d19c6878d2196686385b8e5a0efb73f7b5653720480609fc6f3266f4f5fb807b29d7f82f3ef386f9de576b4024d5da0473425dd7a6ddb4cd08998bb9128aa
-EBUILD nvidia-drivers-535.146.02.ebuild 17180 BLAKE2B b0c2eb64f9d3faa6bce24030072b4b9769aea2e0cab075a60b6666401ac715ba5dafd62d2a29d14f20e300dc5caadf6ac5211f617983b39076c181d6058717f3 SHA512 63e79650fa6ea57e0ed470b894d2a53e40b14b6fa827f8685927972dd9765b567e47c552e33088da6008981733ff74d29a31ff093c8877ba504bf3f4cbff9d77
-EBUILD nvidia-drivers-535.43.22.ebuild 17229 BLAKE2B 2f01898c7bba377f9b27c93d972047123c52878ddbdfea39c7e9b4bdf55c01c3cfde0291aa4bc0523b624a9e29b49f7810c2efd9840bf3cddefe3987ae116de0 SHA512 de5c6bce0308b301ccd427c15de8bd4ab2c3443efde914f09897efb026afa101db32c38cb3e4e0598623a41187632632de9ee787fb48f1c2c45b9ee7d2ce831a
-EBUILD nvidia-drivers-545.29.06-r1.ebuild 16770 BLAKE2B 1beda0a83ba35ce9aff61dfae1e02c9a46da9470002268473c6812ee006e5e0a44fb49062894c302343fdf1e8803bcfed1b99858cfa62096a987ef8585ccff03 SHA512 435548fae2836f6bde66b7b3543fb8b6ad523667722a12529e1f77e8b21188c492baf5d5c8f0b25e1982a89c06cf7f29138c40a50ac032e2d954e974e0276c01
+EBUILD nvidia-drivers-535.146.02.ebuild 17268 BLAKE2B 4d87cba5c894b1ad227743f476c4aa7007ec934fe7a7f576c8786f43b68592bd8fd550b169c173aa86ac1b5a6b344643d9cfdd716a0c72f10bed8d44e869c381 SHA512 de02b0bb01b5a322ff74b6e03eaf376a50a696e89beddc2ed3f6e82608a0ba4db2405191f8aefcf6db2d45675924f50d502a9f15f8e19069d8b71ef407585900
+EBUILD nvidia-drivers-535.43.22.ebuild 17317 BLAKE2B f38ae8158cab1e9a28332fa8ba4c213da2df419a660addcb0028243f8ec26925f3de2ae786f76633f07becb85d86cdd1b70289ec75a12223a61a9c7bf792477e SHA512 a7697694825333deca42505b39e20cb1d4e7254cf4a026f53b4b29d143881e5b788ba9d696f56cfdddab30b3a7d4cf07fb037570a80937f5801524f372baedcf
+EBUILD nvidia-drivers-545.29.06-r1.ebuild 16858 BLAKE2B 375994ba75f7ea8a013d03bd742e494b0ddd629bc6c36e7b6ce3f9767fd7de7516b704ce3768d9d226c45e4fbe43c3dd7c19282c24946e9fc1aa907acd9c7233 SHA512 365c42d917fb1abeb4013001605c137f1801d7c25873d4a98c1a15bd07d6428fa7555ec4c260b6adc8bcb785e8c3386e50c99fe8bd8b9ccde5ddbe952f3a21fd
 MISC metadata.xml 1276 BLAKE2B 9fd18d8984ae4440f9623426edea81096b3aef9e591737d45f434848a24d50bda3ea6fa14fa412a9a59404b6256f00147b1a4650cf5f7a1a1445363fd844b522 SHA512 e46e21f95ea3b84dae5dee6bd2fa61efa4df7ebbf9ecb8033d5d590ad05c1343119822a50a156c3a46fcec5fbd1977cb6d6fc74c32e64ac4e8ded9760f09d91c
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-535.43.22-kernel-6.7.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-535.43.22-kernel-6.7.patch
new file mode 100644
index 000000000000..08833de8344a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-535.43.22-kernel-6.7.patch
@@ -0,0 +1,24 @@
+Typically opt not to patch for kernel support downstream, but in this
+case it's only conditionally broken depending on kernel crypto configs
+and USE=kernel-open, then an (official) NVIDIA representative has
+responded with a fix in [1] which should be safe.
+
+[1] https://github.com/NVIDIA/open-gpu-kernel-modules/issues/574#issuecomment-1809283181
+--- a/kernel/nvidia/libspdm_shash.c
++++ b/kernel/nvidia/libspdm_shash.c
+@@ -89,4 +89,4 @@
+         struct crypto_shash *dst_tfm = dst->tfm;
+-        char *src_ipad = crypto_tfm_ctx_aligned(&src_tfm->base);
+-        char *dst_ipad = crypto_tfm_ctx_aligned(&dst_tfm->base);
++        char *src_ipad = crypto_tfm_ctx_align(&src_tfm->base, crypto_tfm_alg_alignmask(&src_tfm->base) + 1);
++        char *dst_ipad = crypto_tfm_ctx_align(&dst_tfm->base, crypto_tfm_alg_alignmask(&dst_tfm->base) + 1);
+         int ss = crypto_shash_statesize(dst_tfm);
+--- a/kernel-module-source/kernel-open/nvidia/libspdm_shash.c
++++ b/kernel-module-source/kernel-open/nvidia/libspdm_shash.c
+@@ -89,4 +89,4 @@
+         struct crypto_shash *dst_tfm = dst->tfm;
+-        char *src_ipad = crypto_tfm_ctx_aligned(&src_tfm->base);
+-        char *dst_ipad = crypto_tfm_ctx_aligned(&dst_tfm->base);
++        char *src_ipad = crypto_tfm_ctx_align(&src_tfm->base, crypto_tfm_alg_alignmask(&src_tfm->base) + 1);
++        char *dst_ipad = crypto_tfm_ctx_align(&dst_tfm->base, crypto_tfm_alg_alignmask(&dst_tfm->base) + 1);
+         int ss = crypto_shash_statesize(dst_tfm);
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
index 4e12ff078da1..8bc1465f4494 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild
@@ -137,6 +137,9 @@ src_prepare() {
 
 	default
 
+	kernel_is -ge 6 7 &&
+		eapply "${FILESDIR}"/nvidia-drivers-535.43.22-kernel-6.7.patch
+
 	# prevent detection of incomplete kernel DRM support (bug #603818)
 	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel{,-module-source/kernel-open}/conftest.sh || die
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild
index ae62cbc6f0ea..4932e930c654 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.22.ebuild
@@ -140,6 +140,9 @@ src_prepare() {
 
 	default
 
+	kernel_is -ge 6 7 &&
+		eapply "${FILESDIR}"/nvidia-drivers-535.43.22-kernel-6.7.patch
+
 	# prevent detection of incomplete kernel DRM support (bug #603818)
 	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel{,-module-source/kernel-open}/conftest.sh || die
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild
index bf4959d91524..e74a99ad11e1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild
@@ -134,6 +134,9 @@ src_prepare() {
 
 	default
 
+	kernel_is -ge 6 7 &&
+		eapply "${FILESDIR}"/nvidia-drivers-535.43.22-kernel-6.7.patch
+
 	# prevent detection of incomplete kernel DRM support (bug #603818)
 	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel{,-module-source/kernel-open}/conftest.sh || die