Updated for new version.

Fixed the patches to match the difference in directory
structure. Updated the PKGBUILD, based on the official nvidia package.

5 files changed, 45 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8d6ed98f59b..bf59543d16f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,32 @@
 pkgbase = nvidia-grsec
 	pkgdesc = NVIDIA drivers for linux-grsec kernel
-	pkgver = 352.41
-	pkgrel = 2
+	pkgver = 355.11
+	pkgrel = 1
 	url = http://www.nvidia.com/
 	install = nvidia-grsec.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = linux-grsec-headers>=4.1
+	makedepends = nvidia-libgl
+	makedepends = nvidia-utils=355.11
+	makedepends = linux-grsec
+	makedepends = linux-grsec-headers>=4.1.7
 	makedepends = linux-grsec-headers<4.2
-	depends = linux-grsec>=4.1
-	depends = linux-grsec<4.2
-	depends = nvidia-utils=352.41
 	depends = libgl
-	conflicts = nvidia-96xx-grsec
-	conflicts = nvidia-173xx-grsec
+	depends = nvidia-utils=355.11
+	depends = linux-grsec>=4.1.7
+	depends = linux-grsec<4.2
 	options = !strip
-	source = ftp://download.nvidia.com/XFree86/Linux-x86/352.41/NVIDIA-Linux-x86-352.41.run
-	source = ftp://download.nvidia.com/XFree86/Linux-x86_64/352.41/NVIDIA-Linux-x86_64-352.41-no-compat32.run
 	source = nvidia-drivers-pax-usercopy.patch
 	source = nvidia-drivers-pax-constify.patch
 	source = nv-drm.patch
-	md5sums = 3f9c9fed035fa845e3f6a1ea5f5732f7
-	md5sums = d41d1a358edbade36cfd97cdcc9a80b9
-	md5sums = 5277c8699971b9bae8d2845cc00e0e5d
-	md5sums = 29247a931d0d457692ae0bcd278d4d43
-	md5sums = ff8a5f979e4428f8c847423fb007042c
+	md5sums = 2d3de69362039a4ff10b68dadebc49ca
+	md5sums = cea9a028cb816b5495759cfad2d981b6
+	md5sums = 72cdf32a6d35729a12c6c23a7e91e972
+	source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/355.11/NVIDIA-Linux-x86-355.11.run
+	md5sums_i686 = 16d143ccafe99328a2ca8e5a396fd4bc
+	source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/355.11/NVIDIA-Linux-x86_64-355.11-no-compat32.run
+	md5sums_x86_64 = 30133d89690f4683c4e289ec6c0247dc
 
 pkgname = nvidia-grsec
 
diff --git a/PKGBUILD b/PKGBUILD
index a42063ba0d4e..faa2a999b539 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,32 @@
-# Maintainer : Kaan Genç <SeriousBug at gmail dot com>
-# Contributor : Thomas Baechler <thomas@archlinux.org>
+# Maintainer : Kaan Genç <aur@kaangenc.me>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia-grsec
-pkgver=352.41
+pkgver=355.11
 _extramodules=extramodules-4.1.7-grsec
-pkgrel=2
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux-grsec kernel"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux-grsec>=4.1' 'linux-grsec<4.2' "nvidia-utils=${pkgver}" "libgl")
-makedepends=('linux-grsec-headers>=4.1' 'linux-grsec-headers<4.2')
-conflicts=('nvidia-96xx-grsec' 'nvidia-173xx-grsec')
+depends=('libgl' "nvidia-utils=${pkgver}" 'linux-grsec>=4.1.7' 'linux-grsec<4.2')
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux-grsec' 'linux-grsec-headers>=4.1.7' 'linux-grsec-headers<4.2')
 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=('3f9c9fed035fa845e3f6a1ea5f5732f7'
-         'd41d1a358edbade36cfd97cdcc9a80b9'
-         '5277c8699971b9bae8d2845cc00e0e5d'
-         '29247a931d0d457692ae0bcd278d4d43'
-         'ff8a5f979e4428f8c847423fb007042c')
+source=('nvidia-drivers-pax-usercopy.patch'
+         'nvidia-drivers-pax-constify.patch'
+         'nv-drm.patch')
+md5sums=('2d3de69362039a4ff10b68dadebc49ca'
+         'cea9a028cb816b5495759cfad2d981b6'
+         '72cdf32a6d35729a12c6c23a7e91e972')
+md5sums_i686=('16d143ccafe99328a2ca8e5a396fd4bc')
+md5sums_x86_64=('30133d89690f4683c4e289ec6c0247dc')
+source_i686="ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+source_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+md5sums_i686='16d143ccafe99328a2ca8e5a396fd4bc'
+md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc'
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -41,11 +44,6 @@ build() {
     _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
     cd "${_pkg}"/kernel
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-
-    if [[ "$CARCH" = "x86_64" ]]; then
-        cd uvm
-        make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-    fi
 }
 
 package() {
@@ -53,7 +51,7 @@ package() {
         "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
 
     if [[ "$CARCH" = "x86_64" ]]; then
-        install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+        install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
             "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
     fi
 
@@ -61,5 +59,4 @@ package() {
     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
index 4f9620142909..3d894e050109 100644
--- a/nv-drm.patch
+++ b/nv-drm.patch
@@ -1,7 +1,7 @@
 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
+--- 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,
diff --git a/nvidia-drivers-pax-constify.patch b/nvidia-drivers-pax-constify.patch
index 4258cbf8cdff..0944dc1baab9 100644
--- a/nvidia-drivers-pax-constify.patch
+++ b/nvidia-drivers-pax-constify.patch
@@ -1,5 +1,5 @@
---- a/kernel/uvm/uvm_common.c
-+++ b/kernel/uvm/uvm_common.c
+--- 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;
  
diff --git a/nvidia-drivers-pax-usercopy.patch b/nvidia-drivers-pax-usercopy.patch
index 8d50bb954107..292a898bbef0 100644
--- a/nvidia-drivers-pax-usercopy.patch
+++ b/nvidia-drivers-pax-usercopy.patch
@@ -1,5 +1,5 @@
---- a/kernel/nv.c	2015-01-19 01:04:52.529752767 +0000
-+++ b/kernel/nv.c	2015-01-19 01:06:48.772876992 +0000
+--- 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);
@@ -34,8 +34,8 @@
          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
+--- 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;