[gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: metadata.xml ChangeLog nvidia-drivers-304.43.ebuild

[Doug Goldstein (cardoe)]

cardoe      12/08/29 03:41:50

  Modified:             metadata.xml ChangeLog nvidia-drivers-304.43.ebuild
  Log:
  Use Stefan Reimer <it@×××××××.de> Quark's overlay patches for PAX hacks by popular demand. bug #385837.
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.19                 x11-drivers/nvidia-drivers/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/metadata.xml?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/metadata.xml?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/metadata.xml?r1=1.18&r2=1.19

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/metadata.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- metadata.xml	10 Aug 2012 11:28:11 -0000	1.18
+++ metadata.xml	29 Aug 2012 03:41:50 -0000	1.19
@@ -21,5 +21,6 @@
 	<flag name='tools'>Installs additional tools such as nvidia-settings</flag>
 	<flag name='X'>Controls whether the X.org driver, OpenGL libraries,
 		XvMC libraries, and VDPAU libraries are installed</flag>
+	<flag name='pax_kernel'>PaX patches from the PaX project</flag> 
 </use>
 </pkgmetadata>



1.391                x11-drivers/nvidia-drivers/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.391&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.391&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?r1=1.390&r2=1.391

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- ChangeLog	28 Aug 2012 23:05:39 -0000	1.390
+++ ChangeLog	29 Aug 2012 03:41:50 -0000	1.391
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.390 2012/08/28 23:05:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.391 2012/08/29 03:41:50 cardoe Exp $
+
+  29 Aug 2012; Doug Goldstein <cardoe@g.o> nvidia-drivers-304.43.ebuild,
+  +files/nvidia-drivers-pax-const.patch,
+  +files/nvidia-drivers-pax-usercopy.patch:
+  Use Stefan Reimer <it@×××××××.de> Quark's overlay patches for PAX hacks by
+  popular demand. bug #385837.
 
 *nvidia-drivers-304.43 (28 Aug 2012)
 



1.2                  x11-drivers/nvidia-drivers/nvidia-drivers-304.43.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.43.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.43.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.43.ebuild?r1=1.1&r2=1.2

Index: nvidia-drivers-304.43.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.43.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-drivers-304.43.ebuild	28 Aug 2012 23:05:39 -0000	1.1
+++ nvidia-drivers-304.43.ebuild	29 Aug 2012 03:41:50 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.43.ebuild,v 1.1 2012/08/28 23:05:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.43.ebuild,v 1.2 2012/08/29 03:41:50 cardoe Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux +tools +X"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
@@ -139,6 +139,15 @@
 		# If greater than 2.6.5 use M= instead of SUBDIR=
 		convert_to_m "${NV_SRC}"/Makefile.kbuild
 	fi
+
+	if use pax_kernel; then
+		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}"/nvidia-drivers-pax-const.patch
+	    epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
+	fi
+
 	cat <<- EOF > "${S}"/nvidia.icd
 		/usr/$(get_libdir)/libnvidia-opencl.so
 	EOF