diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | nv-drm.patch | 14 | ||||
| -rw-r--r-- | nvidia-drivers-pax-constify.patch | 17 | ||||
| -rw-r--r-- | nvidia-drivers-pax-usercopy.patch | 57 | ||||
| -rw-r--r-- | nvidia-grsec.install | 2 |
6 files changed, 21 insertions, 119 deletions
@@ -1,31 +1,27 @@ pkgbase = nvidia-grsec pkgdesc = NVIDIA drivers for linux-grsec kernel - pkgver = 358.16 - pkgrel = 4 + pkgver = 361.28 + pkgrel = 1 url = http://www.nvidia.com/ install = nvidia-grsec.install arch = i686 arch = x86_64 license = custom makedepends = nvidia-libgl - makedepends = nvidia-utils=358.16 + makedepends = nvidia-utils=361.28 makedepends = linux-grsec makedepends = linux-grsec-headers>=4.3 makedepends = linux-grsec-headers<4.4 depends = libgl - depends = nvidia-utils=358.16 + depends = nvidia-utils=361.28 depends = linux-grsec>=4.3 depends = linux-grsec<4.4 options = !strip - source = nvidia-drivers-pax-usercopy.patch - source = nvidia-drivers-pax-constify.patch - source = nv-drm.patch - source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/355.11/NVIDIA-Linux-x86-358.16.run - source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/355.11/NVIDIA-Linux-x86_64-358.16-no-compat32.run - sha512sums = 6abba40f39cf92f4b25e2e8233d4ac4fd6720b4679697471e513042be156aa51d435eee53c5a71b1be078655580d9a52e364763b38827a6230fdb890bc5e1520 - sha512sums = 7cdd21eb783f48564220122c38bad1a64b0b976f50a6f48411a4d3735d83c5b605bd53336dc8745077e060f0071ddc5ee692f89ae6992e01f5de66ceadf3a73e - sha512sums = 068b494da1be73cace96405c82c0816fab311bba88244a2142bd0be92d84b01e485607bc3570f4eb41509621c073b035616980c3431b71ea60ac66d08ca6f31e - sha512sums_i686 = a5d37fb56a59b9958f6c34139250baf13a1c42ffc70f7deb19ffaac1ae6c2ce80b96649c5797d60754050d75792d14141cd5ebc8820bb73ee4aad4aa6d6c5b20 - sha512sums_x86_64 = eb1abeebbfa807c784e9019afaa3f238d2142b28467c80dcac8d5199cf1082d72ab417e39660bda076023aecb7d04d9c3c91a2d494f1513cfe82b617b17a2297 + source = https://www.grsecurity.net/~paxguy1/nvidia-drivers-361.28-pax.patch + source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/355.11/NVIDIA-Linux-x86-361.28.run + source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/355.11/NVIDIA-Linux-x86_64-361.28-no-compat32.run + sha512sums = 2872af917ee78a0191eef4ef133ca7f660beaa834ec8c6eafe0c827fae1acf71ce31d1194000e8256c9cf00b6297ca1225be374f59c0499a5a7ebf89b6668996 + sha512sums_i686 = 4a18d7df8dabea9da52a5996b6e820f618e6417449b4e329c886d05465b25adb39ae3bd77b2852c93a7338fab2d398f6705bddde315c7373e313f242dc1113ab + sha512sums_x86_64 = 4628161009b6ab3a430c866ff6fbb39be4446408620e10969867059188922891505e7dea269a7ce4cdbb97fb2081ff59db3e5299c7673ffbb503ee7b7bf7cb77 pkgname = nvidia-grsec @@ -5,9 +5,9 @@ # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=nvidia-grsec -pkgver=358.16 -_extramodules=extramodules-4.3.4-grsec -pkgrel=4 +pkgver=361.28 +_extramodules=extramodules-4.3.5-grsec +pkgrel=1 pkgdesc="NVIDIA drivers for linux-grsec kernel" arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -16,16 +16,12 @@ makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux-grsec' 'linux-grsec- license=('custom') install=nvidia-grsec.install options=(!strip) -source=('nvidia-drivers-pax-usercopy.patch' - 'nvidia-drivers-pax-constify.patch' - 'nv-drm.patch') -source_i686="http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" -source_x86_64="http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" -sha512sums=('6abba40f39cf92f4b25e2e8233d4ac4fd6720b4679697471e513042be156aa51d435eee53c5a71b1be078655580d9a52e364763b38827a6230fdb890bc5e1520' - '7cdd21eb783f48564220122c38bad1a64b0b976f50a6f48411a4d3735d83c5b605bd53336dc8745077e060f0071ddc5ee692f89ae6992e01f5de66ceadf3a73e' - '068b494da1be73cace96405c82c0816fab311bba88244a2142bd0be92d84b01e485607bc3570f4eb41509621c073b035616980c3431b71ea60ac66d08ca6f31e') -sha512sums_i686=('a5d37fb56a59b9958f6c34139250baf13a1c42ffc70f7deb19ffaac1ae6c2ce80b96649c5797d60754050d75792d14141cd5ebc8820bb73ee4aad4aa6d6c5b20') -sha512sums_x86_64=('eb1abeebbfa807c784e9019afaa3f238d2142b28467c80dcac8d5199cf1082d72ab417e39660bda076023aecb7d04d9c3c91a2d494f1513cfe82b617b17a2297') +source=("https://www.grsecurity.net/~paxguy1/nvidia-drivers-${pkgver}-pax.patch") +source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +sha512sums=('2872af917ee78a0191eef4ef133ca7f660beaa834ec8c6eafe0c827fae1acf71ce31d1194000e8256c9cf00b6297ca1225be374f59c0499a5a7ebf89b6668996') +sha512sums_i686=('4a18d7df8dabea9da52a5996b6e820f618e6417449b4e329c886d05465b25adb39ae3bd77b2852c93a7338fab2d398f6705bddde315c7373e313f242dc1113ab') +sha512sums_x86_64=('4628161009b6ab3a430c866ff6fbb39be4446408620e10969867059188922891505e7dea269a7ce4cdbb97fb2081ff59db3e5299c7673ffbb503ee7b7bf7cb77') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -34,9 +30,7 @@ prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" # patches here - patch -Np1 -i "../nvidia-drivers-pax-usercopy.patch" - patch -Np1 -i "../nvidia-drivers-pax-constify.patch" - patch -Np1 -i "../nv-drm.patch" + patch -Np1 -i "../nvidia-drivers-${pkgver}-pax.patch" } build() { diff --git a/nv-drm.patch b/nv-drm.patch deleted file mode 100644 index 3d894e050109..000000000000 --- a/nv-drm.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c -index c0b41a0..700c193 100644 ---- a/kernel/nvidia/nv-drm.c -+++ b/kernel/nvidia/nv-drm.c -@@ -128,6 +128,8 @@ static struct drm_driver nv_drm_driver = { - .gem_prime_vmap = nv_gem_prime_vmap, - .gem_prime_vunmap = nv_gem_prime_vunmap, - -+ .set_busid = drm_pci_set_busid, -+ - .name = "nvidia-drm", - .desc = "NVIDIA DRM driver", - .date = "20130102", - diff --git a/nvidia-drivers-pax-constify.patch b/nvidia-drivers-pax-constify.patch deleted file mode 100644 index 0944dc1baab9..000000000000 --- a/nvidia-drivers-pax-constify.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/kernel/nvidia-uvm/uvm_common.c -+++ b/kernel/nvidia-uvm/uvm_common.c -@@ -147,9 +147,11 @@ static RM_STATUS uvmSetupGpuProvider(void) - 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/nvidia-drivers-pax-usercopy.patch b/nvidia-drivers-pax-usercopy.patch deleted file mode 100644 index 292a898bbef0..000000000000 --- a/nvidia-drivers-pax-usercopy.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/kernel/nvidia/nv.c 2015-01-19 01:04:52.529752767 +0000 -+++ b/kernel/nvidia/nv.c 2015-01-19 01:06:48.772876992 +0000 -@@ -713,11 +713,12 @@ - #if defined(KM_CHECKER) - NV_SPIN_LOCK_INIT(&km_lock); - #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"); - rc = -ENOMEM; - goto failed4; -@@ -855,7 +855,8 @@ int __init nvidia_init_module(void) - nv_state_init_gpu_uuid_cache(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; -@@ -866,7 +867,8 @@ 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/common/inc/nv-linux.h 2015-01-19 01:04:52.526419343 +0000 -+++ b/kernel/common/inc/nv-linux.h 2015-01-19 01:05:23.843928675 +0000 -@@ -1445,14 +1445,14 @@ - - 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) \ - kmem_cache_destroy(kmem_cache) diff --git a/nvidia-grsec.install b/nvidia-grsec.install index 245471b19681..0502bf1afc29 100644 --- a/nvidia-grsec.install +++ b/nvidia-grsec.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-4.3.4-grsec' + EXTRAMODULES='extramodules-4.3.5-grsec' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } |