diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-12-01 12:48:02 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-12-01 12:48:02 +0000 |
| commit | 3d92fb4050a12bdae8eabf0728ac1142a9dde9d9 (patch) | |
| tree | 11716d9912c2bf174ae79e54a5a8e03fd697ce25 /x11-drivers/nvidia-drivers | |
| parent | Add a proper REQUIRED_USE for libpeas compatibility, use python_setup() to us... (diff) | |
| download | historical-3d92fb4050a12bdae8eabf0728ac1142a9dde9d9.tar.gz historical-3d92fb4050a12bdae8eabf0728ac1142a9dde9d9.tar.bz2 historical-3d92fb4050a12bdae8eabf0728ac1142a9dde9d9.zip | |
Add new PaX patches (bug #529633).
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'x11-drivers/nvidia-drivers')
5 files changed, 88 insertions, 9 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 044eb37a140c..355eb5fc8523 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.594 2014/11/29 13:44:55 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.595 2014/12/01 12:47:46 jer Exp $ + + 01 Dec 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-346.16.ebuild, + +files/nvidia-drivers-346.16-pax-constify.patch, + +files/nvidia-drivers-346.16-pax-usercopy.patch: + Add new PaX patches (bug #529633). 29 Nov 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.23.ebuild, nvidia-drivers-173.14.39.ebuild, nvidia-drivers-304.123.ebuild, diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index bbc45d096c40..f79cdc3b3551 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -8,6 +8,8 @@ AUX NVIDIA_glx-glheader.patch 380 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b15 AUX nvidia-169.07 639 SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 SHA512 3af295c026280dc3a2b73c2cc7772254686b09cad15f1333ab0b4de8cb0ccf78e725ced2a399b10edcf8af6ba42ab1485dc0661af67461b0c3789f786357772f WHIRLPOOL 626ae3c01c879e0cfe05bd373e0b9dfd6f462dd9ef6ae94a7d60276fe2d17c57fbb20aaa4d2a186a0ffc2a860076692aac854d00a3545bc9736e7bb8d0581055 AUX nvidia-drivers-331.13-pax-usercopy.patch 2127 SHA256 669ffcab77432f116c2b9bc7ed55e2a1f4e208ff19b63d43003af2b346f7c0c0 SHA512 c6ebd534d1e88fe5c1b71ef5ccced8957e34931cab72d1adb4017c703fc2e285f6e36a778bb36a319f505cfe6408be098569944aa5d78c00c8837ffe880d006a WHIRLPOOL 798d3f3edeae2361f039372f5fe13cf9df5aef20ee63c7cdc83e806cbad097b0ddccd6b30968c2b2ceb768ad0425b02aaefe1ba41709e3f0fb79a82f908579a6 AUX nvidia-drivers-337.12-pax-constify.patch 1042 SHA256 abb0c616a1187fd1958fea3e9fe8d3a9207d393cb9b76ccbf9f25f44c427ffc5 SHA512 203b0baf036e4f301959516ab17b6748814bed850bc79da30ae524a3c902fda57942587aba0803ad25891fb4867d88a003658b630849e12bc2c95015a62661b0 WHIRLPOOL 1ca05ff6737455032babf352ce08fdcefd5a006c3c4bc3607385896a5b0b3961fb9c7e1ff0010a28041ff9f9d49e35210d0d350df534a0e238df3e82f7023c64 +AUX nvidia-drivers-346.16-pax-constify.patch 1028 SHA256 c863089ad9fea922392cdceb8cd441901539dd3eb1c2d1a1e82cc778df58766a SHA512 63ae55875d428fae02a85ca9a534f2574494dc8872055251893d7b000c28334b69e046a5fbc920c3e45bc28535091489595e681407ea1adecf50c70936173812 WHIRLPOOL db1783d4f0c51f2962819e21ecff7c77f7a193870f433dc69dc024805221f239f663794f78d7d632c9ebf2491eeab27e0845e9ce5ba9272fb11fdbcbeaa6ecfe +AUX nvidia-drivers-346.16-pax-usercopy.patch 1928 SHA256 b39e737c87bec8b2d15ec7a0e6d887ccc7038b918bbdbb2b3673ed3ae450876b SHA512 46e575dcc923b66e59e4215172b943b81780736fea4f7eed7aef0d49d816664d013ab5d77634287e2d6d17bf5df758f7ef4ccd4d541f9f8cb3fb14af4faf3218 WHIRLPOOL 54d7e0077ed7bed879416aba7615cb91623fe0c6d115573602742c047dc10e75355cf24b2dd7b05151d947aa58366f9bf405d947fac90fcf0ec05ce751f02eaa AUX nvidia-drivers-pax-const.patch 833 SHA256 74ba8aa3b03e1b4a0515fd84c159eaeb7635fa1364e77544b01ff6f571f0e6d8 SHA512 6ef94db71cab2dd47273eaed1857209d03ef648d268c7645f3ca4caf6b894590e42a8e716e4354f2eed656e7d55a4c1774b1e6a4be215fbf59fc9d0b1a5762a0 WHIRLPOOL 1b2d737ee7ccee831c85bd8af9605c0633fd025bb209e6d76c13f49a5664aa490bd5b6ce48855e541fe87380cd7b723162e1965b803e1ed630f239bf4dbd0d19 AUX nvidia-drivers-pax-usercopy.patch 2350 SHA256 56980f43db38d582bc6a9bfd881973fce6e3e056b77ce4f4005bdcf79526a863 SHA512 54a1354ba008d014a608044610027b4d808120f8e77cc7d5ac855c3dcf4f487b0a4c0870ae4e727db0643cb56ee21513b803976e9a30c6838adf2f5414232804 WHIRLPOOL 78ac54bfe52cc3b6dfa28e17020991dfb7056984d667b0fefa41d23372b03e1a8e6d66c74e1dee234733d5b2b36e2c0813f507a89716ae2d8f1f6db917fdf01d AUX nvidia-drivers-settings.desktop 193 SHA256 31c062449b8bcc8adcd3ee649d8aebf0bef502400bcbbbb46124217e1efb17a3 SHA512 fbb81d2520e9025fbffb2a8e7b3647f621ddc9d36c79d063d49e901286e8d1ea45de1274f42e33ff1aece5cebd547a42829d65b421db39d808947554b0f57453 WHIRLPOOL c797eb0ec1044ecaaa979ca5180f840d9c82c5c040dd81b2d86ca4afade9f0c006fb8951f04cc4d2b206110d38b339690386d291ff8f625a22b38178a3cd970b @@ -58,15 +60,15 @@ EBUILD nvidia-drivers-334.21-r3.ebuild 13317 SHA256 39096135fd2ce976398246799744 EBUILD nvidia-drivers-337.25.ebuild 13319 SHA256 56edce4586796d026c5a2f8dc1b81f471eeeb04667306f69edcd90175fcaf5e5 SHA512 11664d92b3d71a43ec77a249101a46a3985f106797ef28bc4575e2262cfda80325636589c17d8c17f4fd81cf86b0ada78c41e5865dc8e75f01eb3178926a8716 WHIRLPOOL 799f7a07885f2e68680cc45177bd0dc0021a104ba3f68ff456063792cf2752c12db155fa707a00166d82d259c19e098bfdb48c6e9f246b1e10f314d9c1b98563 EBUILD nvidia-drivers-340.58.ebuild 13647 SHA256 4cbeeedf57f7fea129170e5095457ffc8299af757be875908bad72d9e27255e1 SHA512 d29f01e5dcc8cbaa9655a36dc6b78ba330ea44a12ccc0f1741d3adaaf59c5d80758f793d47259a0ab9be14cd38ef2f292f54dcbcb3e5ce79cd16637c869dc1ca WHIRLPOOL d616a5c1272f33da215bcebe4d1a3c09ef0fa3d1efa54ea18e043386259e42cdd7b58b4a2c236e2aa65b0376e1b0ab98e169dec450f02ba09327bc6308fb5138 EBUILD nvidia-drivers-343.22-r2.ebuild 13650 SHA256 e8b8a0adf6cff9e32c96a2e6d5a8a6014c46436c39eac42f2b6a70e701770c65 SHA512 6ab9a810ab324e3296816a41ef4b7eb8c8c1114dca30a94fd3ecf5efadb8c14ae0ab6790d7bd284e414bca55fa56b2f0073dea076f6c068823ad9961baf284df WHIRLPOOL 91cf0b6ad94e4abcd6f76c38dc20477d151c47d8dc191b48897e70c4f10791a57646c81fc81e40e6777044736783a0e5d1e81361bdcd08e7d4896960bb780305 -EBUILD nvidia-drivers-346.16.ebuild 13962 SHA256 fb03db2377032c99661e0120c6dd0d6df94a8f5daaf51f1187fa7e1cae2cbb9b SHA512 7d22bf6296e60580d8a2d6af41d9a122dce1780aa7923c24018af837251bbbd9bea99eb0a0ca4c3b40248efa30592f0a6dec363e3ecef55c5c36f004edb37684 WHIRLPOOL c2eb7349b87de1798bd0ae2e825030a285883f48f8f607bbdd2f849a53c2e11832f2e3288864e07df533533171e15b3aac659880c6bb954f1da8ee2cd92de0db +EBUILD nvidia-drivers-346.16.ebuild 13962 SHA256 7bdc0d73677c7ff5ccf77d65dea06902d6aeadafac10160d43a937d268d27d42 SHA512 87aa63c194d797861e52f160e6bcf0aebfa40926d330f00232bb686b7d61f591fa5ae89099f5641c6d17fbdd771d3589714a653389628e3f097454002cff45dc WHIRLPOOL 9d372f250ff2fd7304d52e8ab75f1201ba49b95280fa5cc214636139707339f5982b1366497bf2338b7dbbf07106814a2a343c491cab98a8380b57e75142fa0a EBUILD nvidia-drivers-96.43.23.ebuild 14868 SHA256 ba078fff7872b5534d4624ed05eae459f8b6e4d6600d86853135795c10e5f301 SHA512 1b6d419371640940f7fd3d36936ecaa886a5100f5511ad3d239d470c69c1308125581f85d88c45e7df230dce61330dcf06ebfdeedd704e5ed2ccfcc1caf9d5ca WHIRLPOOL cd0d3b0991317ecd849874cc505a3ba837189c9a145be35c5b9b6b7e9c45f57f5de8cc91869575388c10b617f2bbdfa47661b5c18f17fb8ba49d13911e22d056 -MISC ChangeLog 15047 SHA256 5a27cd694834139da4c99703e551406d918affb1370ef67679d51f23daf830ab SHA512 1480a5cb08097e6aa8ee9b28393416f67756a70e94995d681a01a88f355226b27cf6f7d5fc408abce9028f0d898dd87cd46964d62c37057c997fb2e68857eec1 WHIRLPOOL 09c3279830581a917d0b03f9401558c551aca5cb4d4d386aec79e44c038c8b3c6e169177e3adf6c652f05ae10cf6705d8b163c55c96e0fcee4fb87e6028c1f3f +MISC ChangeLog 15264 SHA256 fc5024f9519319283cf370cb6f737940f8b0553a962452ffb96a7608c0a439d9 SHA512 624b5bfc3fd692b52e659013f9b20f9e039ba635dae17daee3d7a48fc9eeb95ce4b16c24bae852a485c5f417ea033302a56329d0fa456032fbc2c66b7f567f22 WHIRLPOOL 42d2aa4a64c0a041b1c1caac0340ba921f3e558cc3cfeea7ec6c89e7f5bff011e2c5de87600fb9b990ea6fff84cb3924e07140d27287da5b426a7f2a74b36c60 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba MISC metadata.xml 739 SHA256 f455845cee6b0247e229d7635f300565411d8e5f7462c8833a4ecad2a4ddf343 SHA512 f1a87a421415e988f96a597247eefd24285bb9709b81ff446e2056bf9ea99c170216c92b43605cdd0e238697989031bc72f8aa104231b1e36fc2338677312bda WHIRLPOOL 95199a2e4e10954ce93daddb0802e608fb4425ae73e57cea61882960ec4916b556b7ef7a87b315a2c6687e98c603e049003948f7388a9a8f8cf8714a16ba6734 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlR5zesACgkQVWmRsqeSphM0LgCfYYa1f7lX8P7dBJay5W5mLssZ -AUEAniTivvVNqNGQHz5vgHRZ7T3rburI -=UCog +iEYEAREIAAYFAlR8Y4IACgkQVWmRsqeSphO2TQCfa7NuoIgeNXWA66Sr4vlk82cI +nmAAn2uIE9+E4VnxM+EnEevbzw+qh/6D +=nwk2 -----END PGP SIGNATURE----- diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch new file mode 100644 index 000000000000..9b9f53e45dcc --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch @@ -0,0 +1,25 @@ +--- a/kernel/uvm/uvm_common.c ++++ b/kernel/uvm/uvm_common.c +@@ -95,7 +95,6 @@ static RM_STATUS uvmnext_gpu_event_stop_ + #endif // NVIDIA_UVM_NEXT_ENABLED + + static dev_t g_uvmBaseDev; +-struct UvmOpsUvmEvents g_exportedUvmOps; + + // TODO: This would be easier if RM allowed for multiple registrations, since we + // could register UVM-Lite and UVM-Next separately (bug 1372835). +@@ -147,9 +146,11 @@ static RM_STATUS uvmSetupGpuProvider(voi + RM_STATUS status = RM_OK; + + #ifdef NVIDIA_UVM_RM_ENABLED +- g_exportedUvmOps.startDevice = uvm_gpu_event_start_device; +- g_exportedUvmOps.stopDevice = uvm_gpu_event_stop_device; +- g_exportedUvmOps.isrTopHalf = uvmnext_isr_top_half; ++ static struct UvmOpsUvmEvents g_exportedUvmOps = { ++ .startDevice = uvm_gpu_event_start_device, ++ .stopDevice = uvm_gpu_event_stop_device, ++ .isrTopHalf = uvmnext_isr_top_half, ++ }; + + // call RM to exchange the function pointers. + status = nvUvmInterfaceRegisterUvmCallbacks(&g_exportedUvmOps); diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch new file mode 100644 index 000000000000..d1a440c94aae --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch @@ -0,0 +1,47 @@ +--- a/kernel/nv.c ++++ b/kernel/nv.c +@@ -705,7 +705,7 @@ int __init nvidia_init_module(void) + #endif + + nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name, +- nvidia_stack_t); ++ nvidia_stack_t, SLAB_USERCOPY); + if (nvidia_stack_t_cache == NULL) + { + nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n"); +@@ -846,7 +846,7 @@ int __init nvidia_init_module(void) + nv_lock_init_locks(nv); + + nvidia_pte_t_cache = NV_KMEM_CACHE_CREATE(nvidia_pte_cache_name, +- nvidia_pte_t); ++ nvidia_pte_t, 0); + if (nvidia_pte_t_cache == NULL) + { + rc = -ENOMEM; +@@ -857,7 +857,7 @@ int __init nvidia_init_module(void) + if (!nv_multiple_kernel_modules) + { + nvidia_p2p_page_t_cache = NV_KMEM_CACHE_CREATE(nvidia_p2p_page_cache_name, +- nvidia_p2p_page_t); ++ nvidia_p2p_page_t, 0); + if (nvidia_p2p_page_t_cache == NULL) + { + rc = -ENOMEM; +--- a/kernel/nv-linux.h ++++ b/kernel/nv-linux.h +@@ -1431,11 +1431,11 @@ extern void *nvidia_stack_t_cache; + + #if !defined(NV_VMWARE) + #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5) +-#define NV_KMEM_CACHE_CREATE(name, type) \ +- kmem_cache_create(name, sizeof(type), 0, 0, NULL) ++#define NV_KMEM_CACHE_CREATE(name, type, flags) \ ++ kmem_cache_create(name, sizeof(type), 0, flags, NULL) + #else +-#define NV_KMEM_CACHE_CREATE(name, type) \ +- kmem_cache_create(name, sizeof(type), 0, 0, NULL, \ ++#define NV_KMEM_CACHE_CREATE(name, type, flags) \ ++ kmem_cache_create(name, sizeof(type), 0, flags, NULL, \ + NULL) + #endif + #define NV_KMEM_CACHE_DESTROY(kmem_cache) \ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild index 06266d5a4ec3..ab38acf163b5 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild,v 1.5 2014/11/15 17:44:35 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.16.ebuild,v 1.6 2014/12/01 12:47:46 jer Exp $ EAPI=5 @@ -174,8 +174,8 @@ src_prepare() { ewarn "Using PAX patches is not supported. You will be asked to" ewarn "use a standard kernel should you have issues. Should you" ewarn "need support with these patches, contact the PaX team." - epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch - epatch "${FILESDIR}"/${PN}-337.12-pax-constify.patch + epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch + epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch fi # Allow user patches so they can support RC kernels and whatever else |