Adopted the package and migrated to AUR4.

6 files changed, 190 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..1730680a87c2
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,31 @@
+pkgbase = nvidia-grsec
+	pkgdesc = NVIDIA drivers for linux-grsec kernel
+	pkgver = 352.21
+	pkgrel = 2
+	url = http://www.nvidia.com/
+	install = nvidia-grsec.install
+	arch = i686
+	arch = x86_64
+	license = custom
+	makedepends = linux-grsec-headers>=4.0
+	makedepends = linux-grsec-headers<4.1
+	depends = linux-grsec>=4.0
+	depends = linux-grsec<4.1
+	depends = nvidia-libgl
+	depends = nvidia-utils=352.21
+	conflicts = nvidia-96xx-grsec
+	conflicts = nvidia-173xx-grsec
+	options = !strip
+	source = ftp://download.nvidia.com/XFree86/Linux-x86/352.21/NVIDIA-Linux-x86-352.21.run
+	source = ftp://download.nvidia.com/XFree86/Linux-x86_64/352.21/NVIDIA-Linux-x86_64-352.21-no-compat32.run
+	source = nvidia-drivers-pax-usercopy.patch
+	source = nvidia-drivers-pax-constify.patch
+	source = nv-drm.patch
+	md5sums = c91760a04f658845722380f6c7fd4709
+	md5sums = 4eea308a1b04553f720f82fd2fac79d3
+	md5sums = 5277c8699971b9bae8d2845cc00e0e5d
+	md5sums = 29247a931d0d457692ae0bcd278d4d43
+	md5sums = ff8a5f979e4428f8c847423fb007042c
+
+pkgname = nvidia-grsec
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..cd11643f8905
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,58 @@
+# Maintainer : Kaan Genç <SeriousBug at gmail dot com>
+# Contributor : Thomas Baechler <thomas@archlinux.org>
+
+pkgname=nvidia-grsec
+pkgver=352.21
+_extramodules=extramodules-4.0.7-grsec
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux-grsec kernel"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux-grsec>=4.0' 'linux-grsec<4.1' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-grsec-headers>=4.0' 'linux-grsec-headers<4.1')
+conflicts=('nvidia-96xx-grsec' 'nvidia-173xx-grsec')
+license=('custom')
+install=nvidia-grsec.install
+options=(!strip)
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+        "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+        "nvidia-drivers-pax-usercopy.patch"
+        "nvidia-drivers-pax-constify.patch"
+        "nv-drm.patch")
+md5sums=('c91760a04f658845722380f6c7fd4709'
+         '4eea308a1b04553f720f82fd2fac79d3'
+         '5277c8699971b9bae8d2845cc00e0e5d'
+         '29247a931d0d457692ae0bcd278d4d43'
+         'ff8a5f979e4428f8c847423fb007042c')
+
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+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"
+}
+
+build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${_pkg}"/kernel
+    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+    cd uvm
+    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package() {
+    install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+        "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+    install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+        "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
+    install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+    echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-grsec.conf"
+    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia-grsec.install"
+}
diff --git a/nv-drm.patch b/nv-drm.patch
new file mode 100644
index 000000000000..4f9620142909
--- /dev/null
+++ b/nv-drm.patch
@@ -0,0 +1,14 @@
+diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index c0b41a0..700c193 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/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
new file mode 100644
index 000000000000..4258cbf8cdff
--- /dev/null
+++ b/nvidia-drivers-pax-constify.patch
@@ -0,0 +1,17 @@
+--- a/kernel/uvm/uvm_common.c
++++ b/kernel/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
new file mode 100644
index 000000000000..8d50bb954107
--- /dev/null
+++ b/nvidia-drivers-pax-usercopy.patch
@@ -0,0 +1,57 @@
+--- a/kernel/nv.c	2015-01-19 01:04:52.529752767 +0000
++++ b/kernel/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/nv-linux.h	2015-01-19 01:04:52.526419343 +0000
++++ b/kernel/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
new file mode 100644
index 000000000000..9b0951352440
--- /dev/null
+++ b/nvidia-grsec.install
@@ -0,0 +1,13 @@
+post_install() {
+    EXTRAMODULES='extramodules-4.0.7-grsec'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}